WIP

codebar-ag · Sep 21, 2023 · a901d63 · a901d63
1 parent 23f8e48
commit a901d63
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
@@ -1,13 +1,6 @@
 name: PHPStan
 
 on:
-<<<<<<< HEAD
-=======
-  pull_request:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
->>>>>>> 67aa803fa405c790afcc1f34b4afa5957b827114
   push:
     branches: [ main ]
   pull_request: