From d4b3fef9efbc49ef6147ea0ee3dfa4710884094c Mon Sep 17 00:00:00 2001
From: mardock2009 <admin@myhostingapp.com>
Date: Tue, 17 Feb 2026 14:48:51 +0000
Subject: [PATCH] fix

---
 git-sync.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-sync.sh b/git-sync.sh
index 1014eb9..de5298c 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 "======================================"
 echo "✅ Zrobione:"
@@ -20,4 +20,4 @@ echo "======================================"
 git checkout main
 =======
 echo "Gotowe. Teraz możesz tworzyć nową gałąź."
->>>>>>> Stashed changes
+