fix(composer.json): resolve merge conflict by removing duplicate "sym…

…plify/phpstan-rules" dependency
laraxot · Jun 3, 2024 · aaa64e2 · aaa64e2
1 parent 3cd3d71
commit aaa64e2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -50,6 +50,7 @@
         "rector/phpstan-rules": "*",
         "rector/rector": "^0.18.6",
         "spatie/laravel-ray": "*",
+<<<<<<< HEAD
 <<<<<<< HEAD
         "symplify/phpstan-rules": "^12.4",
 =======
@@ -58,6 +59,9 @@
         "symplify/phpstan-rules": "*",
 >>>>>>> 7257190 (up)
 >>>>>>> 277700a (chore(composer.json): resolve merge conflict in composer.json file)
+=======
+        "symplify/phpstan-rules": "*",
+>>>>>>> 708f5d1 (fix(composer.json): resolve merge conflict by removing duplicate "symplify/phpstan-rules" dependency)
         "thecodingmachine/phpstan-safe-rule": "^1.2",
         "tightenco/duster": "^2.2",
         "vimeo/psalm": "^5.15"