Fix typo

markwalet · markwalet · commit 1ea73e3dfa5f · 2025-02-03T10:17:32.000+01:00
diff --git a/composer.json b/composer.json
@@ -35,15 +35,8 @@
   "config": {
     "sort-packages": true
   },
-<<<<<<< Updated upstream
-  "minimum-stability": "dev",
-=======
-<<<<<<< Updated upstream
-=======
   "minimum-stability": "dev",
   "prefer-stable": true,
->>>>>>> Stashed changes
->>>>>>> Stashed changes
   "extra": {
     "laravel": {
       "providers": [
