Merge pull request #95 from eXsio/patch-1

Update composer.json
jackalope · Oct 10, 2014 · 186ab65 · 186ab65
2 parents 60e1a52 + 954d7fc
commit 186ab65
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -23,6 +23,9 @@
         "phpcr/phpcr-utils": "~1.1",
         "jackalope/jackalope": "~1.1.0"
     },
+    "conflict": {
+	"lib-curl": "7.35"
+    },
     "provide": {
         "jackalope/jackalope-transport": "1.1.0"
     },