Update git-sync.sh

2026-02-17 23:23:21 +00:00 · 2026-02-17 23:23:21 +00:00 · 01baf72d52
commit 01baf72d52
parent 16673d1b64
1 changed files with 1 additions and 1 deletions
--- a/git-sync.sh
+++ b/git-sync.sh
@ -8,7 +8,7 @@ git pull origin main
 git fetch --prune
 git branch --merged main | grep -v '^ *main$' | xargs git branch -d 2>/dev/null || true

-<<<<<<< Updated upstream
+

 echo ""
 echo "======================================"