Merge pull request #51 from PSchwisow/conflict-pong

Update composer.json to mark pong plugin as a conflict.
phergie · Dec 14, 2015 · 55efba1 · 55efba1
2 parents 4b098d9 + b681667
commit 55efba1
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 83 deletions.
diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
         "source": "https://github.com/phergie/phergie-irc-client-react"
     },
     "require": {
-        "php": ">=5.4.2",
+        "php": ">=5.5",
         "phergie/phergie-irc-parser": "~2.0",
         "phergie/phergie-irc-generator": "~1.5",
         "phergie/phergie-irc-connection": "~2.0",
@@ -25,6 +25,9 @@
     "require-dev": {
         "phergie/phergie-irc-bot-react-development": "~1.0.0"
     },
+    "conflict" : {
+        "phergie/phergie-irc-plugin-react-pong": "*"
+    },
     "autoload": {
         "psr-4": {
             "Phergie\\Irc\\Client\\React\\": "src"