added conflict section to composer.json

danrot · danrot · commit 4b8024a4a377 · 2015-06-10T22:53:33.000+02:00
diff --git a/composer.json b/composer.json
@@ -31,6 +31,9 @@
         "phpcr/phpcr": "~2.1.0",
         "symfony/console": "2.*,>=2.0.5"
     },
+    "conflict": {
+        "jackalope/jackalope-jackrabbit": "<1.2.1"
+    },
     "autoload": {
         "psr-0": {
             "PHPCR\\Util": "src"
