mardock2009/oscam-2.26.01-11942-802-with-Advanced-fake-dcw-detection
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'fix' (#7) from fix-fix into main

Browse Source 
Reviewed-on: #7
This commit is contained in:
Damian Edkovic 2026-02-17 14:49:52 +00:00
commit c3a4708e09
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git-sync.sh
View File

@ -8,7 +8,7 @@ git pull origin main
git fetch --prune git fetch --prune
git branch --merged main | grep -v '^ *main$' | xargs git branch -d 2>/dev/null || true git branch --merged main | grep -v '^ *main$' | xargs git branch -d 2>/dev/null || true
<<<<<<< Updated upstream
echo "" echo ""
echo "======================================" echo "======================================"
echo "✅ Zrobione:" echo "✅ Zrobione:"
@ -20,4 +20,4 @@ echo "======================================"
git checkout main git checkout main
======= =======
echo "Gotowe. Teraz możesz tworzyć nową gałąź." echo "Gotowe. Teraz możesz tworzyć nową gałąź."
>>>>>>> Stashed changes