chore: fix conflict

vichannnnn · Jul 18, 2023 · a91812b · a91812b
1 parent c9e61e7
commit a91812b
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/.github/workflows/pull-request-test.yml b/.github/workflows/pull-request-test.yml
@@ -1,18 +1,11 @@
 name: Pull Request Test
 
 on:
-<<<<<<<< HEAD:.github/workflows/pull-request-test.yml
   pull_request:
     branches:
       - dev
       - master
 
-========
-  push:
-    branches:
-      - dev
-      - master
->>>>>>>> f52a5fa (v1.0.0 official release  (#72)):.github/workflows/test.yml
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: vichannnnn/holy-grail