Merge pull request #261 from havvg/1.2

add conflict with SensioFrameworkExtraBundle >=2.4
2013-12-07 02:16:08 -08:00 · 2013-12-07 02:16:08 -08:00 · ef95bcd63c
commit ef95bcd63c
parent 967bc8769a 2a6814d8d2
1 changed files with 3 additions and 0 deletions
--- a/composer.json
+++ b/composer.json
@ -16,6 +16,9 @@
    "sensio/framework-extra-bundle": "~2.2",
    "fzaninotto/faker": "dev-master"
  },
+  "conflict": {
+      "sensio/framework-extra-bundle": ">=2.4"
+  },
  "autoload": {
    "psr-0": { "Propel\\PropelBundle": "" }
  },