Permalink
Browse files

revert addition of "conflict" to composer.json (not needed now that w…

…e are switching to 1.4)

Revert "Merge branch '1.2' into survos"

This reverts commit 62ca693, reversing
changes made to a95b42c.
  • Loading branch information...
1 parent 62ca693 commit 96416e909ae9ea5273e57129e7048045bb39e425 @kcivey kcivey committed Dec 9, 2013
Showing with 0 additions and 3 deletions.
  1. +0 −3 composer.json
View
3 composer.json
@@ -16,9 +16,6 @@
"sensio/framework-extra-bundle": "~2.2",
"fzaninotto/faker": "dev-master"
},
- "conflict": {
- "sensio/framework-extra-bundle": ">=2.4"
- },
"autoload": {
"psr-0": { "Propel\\PropelBundle": "" }
},

0 comments on commit 96416e9

Please sign in to comment.