Merge pull request #53 from Propaganistas/patch-1

Remove conflict definition
giggsey · Apr 9, 2024 · 8daadbd · 8daadbd
2 parents feef98f + 447869c
commit 8daadbd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
@@ -15,10 +15,6 @@ jobs:
     name: "PHPStan"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ github.head_ref }}
-
       - name: Checkout
         uses: actions/checkout@v4
 

diff --git a/composer.json b/composer.json
@@ -76,9 +76,6 @@
     "phpunit/phpunit": "^9.5.26",
     "symfony/console": "^6.0"
   },
-  "conflict": {
-    "giggsey/libphonenumber-for-php": "*"
-  },
   "suggest": {
     "giggsey/libphonenumber-for-php": "Use libphonenumber-for-php for geocoding, carriers, timezones and matching"
   },