Fix merge error

OpenShock · Sep 19, 2023 · 9896983 · 9896983
1 parent 9df11e5
commit 9896983
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/ci-tag.yml b/.github/workflows/ci-tag.yml
@@ -12,11 +12,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-<<<<<<< HEAD
       - uses: actions/checkout@v4
-=======
-      - uses: actions/checkout@v3
->>>>>>> e0dc1d9 (Modify push-tag.yml to become ci-tag.yml similar to CI in WebUI project)
 
       - uses: actions/cache@v3
         with: