fix merge

neCo2 · May 22, 2024 · 6352a8e · 6352a8e
1 parent 8b47059
commit 6352a8e
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/.github/workflows/compile_mikupad.yml b/.github/workflows/compile_mikupad.yml
@@ -13,8 +13,6 @@ jobs:
     steps:
     - name: Checkout Local Repository
       uses: actions/checkout@v4
-      with:
-        ref: ${{ github.ref }}
 
     - name: Set up Node.js
       uses: actions/setup-node@v4
@@ -32,9 +30,8 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        git remote add upstream https://github.com/lmg-anon/mikupad.git main
-        git fetch upstream main
-        git checkout use
+        git remote add upstream https://github.com/lmg-anon/mikupad.git
+        git fetch upstream
         git merge upstream/main
 
     - name: run compile.sh