Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
neCo2 committed May 22, 2024
1 parent aa45bec commit adbd828
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion .github/workflows/compile_mikupad.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git remote set-url upstream https://github.com/lmg-anon/mikupad.git
git remote add upstream https://github.com/lmg-anon/mikupad.git
git fetch upstream main
git checkout use
git merge upstream/main
- name: run compile.sh
Expand Down

0 comments on commit adbd828

Please sign in to comment.