diff --git a/scripts/git/git_merge_dev_push_main.sh b/scripts/git/git_merge_dev_push_main.sh index 4ea3617..e56f6df 100644 --- a/scripts/git/git_merge_dev_push_main.sh +++ b/scripts/git/git_merge_dev_push_main.sh @@ -22,7 +22,6 @@ fi # ===== PROCESS ===== git checkout main -git pull origin main git merge dev git push origin main git checkout dev diff --git a/templates/clans/overview.html b/templates/clans/overview.html index 4e986f8..e730b3c 100644 --- a/templates/clans/overview.html +++ b/templates/clans/overview.html @@ -425,7 +425,7 @@