Merge 097f13d into 435d493

api-platform · Oct 3, 2019 · 08974ca · 08974ca
2 parents 435d493 + 097f13d
commit 08974ca
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -36,8 +36,8 @@
         "doctrine/data-fixtures": "^1.2.2",
         "doctrine/doctrine-bundle": "^1.8",
         "doctrine/doctrine-cache-bundle": "^1.3.5",
-        "doctrine/mongodb-odm": "^2.0@rc",
-        "doctrine/mongodb-odm-bundle": "^4.0@rc",
+        "doctrine/mongodb-odm": "^2.0",
+        "doctrine/mongodb-odm-bundle": "^4.0",
         "doctrine/orm": "^2.6.3",
         "elasticsearch/elasticsearch": "^6.0",
         "friendsofsymfony/user-bundle": "^2.2@dev",
@@ -89,8 +89,7 @@
     },
     "conflict": {
         "doctrine/common": "<2.7",
-        "doctrine/mongodb-odm": "<2.0",
-        "doctrine/mongodb-odm-bundle": "4.0.0-RC2"
+        "doctrine/mongodb-odm": "<2.0"
     },
     "suggest": {
         "doctrine/mongodb-odm-bundle": "To support MongoDB. Only versions 4.0 and later are supported.",