From 01baf72d526cc16dd068fcc95b1e2bbebfe9692d Mon Sep 17 00:00:00 2001
From: Damian Edkovic <admin@myhostingapp.com>
Date: Tue, 17 Feb 2026 23:23:21 +0000
Subject: [PATCH] Update git-sync.sh

---
 git-sync.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-sync.sh b/git-sync.sh
index dccae88..44dc73c 100755
--- 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 "======================================"