Merge branch 'main' into 3.x

Andrey Helldar · web-flow · commit a4148c929b22 · 2021-11-20T16:21:38.000+03:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,10 +1,12 @@
 * text=auto
 
-/tests export-ignore
-.editorconfig export-ignore
+tests/ export-ignore
+
+.codecov.yml export-ignore
 .gitattributes export-ignore
 .gitignore export-ignore
+.scrutinizer.yml export-ignore
 .styleci.yml export-ignore
-.travis.yml export-ignore
-phpunit.xml.dist export-ignore
-CONTRIBUTING.md   export-ignore
+
+phpunit.php export-ignore
+phpunit.xml export-ignore
diff --git a/composer.json b/composer.json
@@ -27,6 +27,9 @@
         "laravel/framework": "^6.0|^7.0|^8.0",
         "laravel/lumen-framework": "^6.0|^7.0|^8.0"
     },
+    "conflict": {
+        "andrey-helldar/laravel-support": "*"
+    },
     "autoload": {
         "psr-4": {
             "DragonCode\\LaravelSupport\\": "src"
