Move tightenco/collect to 'conflict' (#23379)

laravel · Mar 4, 2018 · fe634d6 · fe634d6
1 parent 7339578
commit fe634d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -67,7 +67,9 @@
         "illuminate/support": "self.version",
         "illuminate/translation": "self.version",
         "illuminate/validation": "self.version",
-        "illuminate/view": "self.version",
+        "illuminate/view": "self.version"
+    },
+    "conflict": {
         "tightenco/collect": "<5.5.33"
     },
     "require-dev": {

diff --git a/src/Illuminate/Support/composer.json b/src/Illuminate/Support/composer.json
@@ -20,7 +20,7 @@
         "illuminate/contracts": "5.6.*",
         "nesbot/carbon": "^1.20"
     },
-    "replace": {
+    "conflict": {
         "tightenco/collect": "<5.5.33"
     },
     "autoload": {