Merge branch 'master' of .. into 84_shift_overleaf

ShiqiYang2022 · Sep 4, 2023 · be12eea · be12eea
2 parents d32ef40 + d10553a
commit be12eea
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/template_issue84_sync.yml b/.github/workflows/template_issue84_sync.yml
@@ -36,5 +36,5 @@ jobs:
         git config pull.rebase false
         git config --global user.email "shiqi.yang2022@gmail.com"
         git config --global user.name "ShiqiYang2022"
-        git pull --no-ff ../ master
+        git pull ../ master
         git push origin 84_shift_overleaf