fix after rebase

FriendsOfSymfony · May 9, 2018 · 516c451 · 516c451
1 parent 5a9b2a1
commit 516c451
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -48,15 +48,12 @@
         "symfony/yaml": "^2.7 || ^3.0 || ^4.0",
         "twig/twig": "^1.34 || ^2.0"
     },
-    "replace": {
-        "egeloen/ckeditor-bundle": "^6.0"
-    },
     "suggest": {
         "egeloen/form-extra-bundle": "Allows to load CKEditor asynchronously"
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-master": "1.x-dev"
         }
     },
     "autoload": {