Merge 2b1ad11 into c21fbd5

spatie · Sep 8, 2019 · 66d52ba · 66d52ba
2 parents c21fbd5 + 2b1ad11
commit 66d52ba
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -28,6 +28,9 @@
         "illuminate/support": "^5.8 || ^6.0",
         "spatie/enum": "^2.1"
     },
+    "conflict": {
+        "bensampo/laravel-enum": "*"
+    },
     "require-dev": {
         "orchestra/testbench": "^3.8 || ^4.0",
         "phpunit/phpunit": "^8.0"