Fix merge conflict in restic_backup.sh

- Keep both prune coordination (2-4 AM window) and rclone timeout (20m)
- Add lock retry settings to prune operation
- Remove merge conflict markers

1 files changed, 1 insertions, 18 deletions

diff --git a/restic_backup.sh b/restic_backup.sh
index e5c146e..cc749e6 100755
--- a/restic_backup.sh
+++ b/restic_backup.sh
@@ -45,23 +45,7 @@ restic backup \
 	exit 1
 }
 
-<<<<<<< HEAD
-# Prune old snapshots
-echo "Applying Restic retention policy and pruning old snapshots..."
-restic forget \
-	--repo "${RESTIC_REPOSITORY}" \
-	--password-file "${RESTIC_PASSWORD_FILE}" \
-	--keep-daily 7 \
-	--keep-weekly 4 \
-	--keep-monthly 6 \
-	--keep-yearly 6 \
-	--option rclone.timeout=20m \
-	--prune || {
-	echo "Error: Restic forget/prune failed." >&2
-	notify "Restic Backup ($(whoami)@$(hostname))" "Prune phase failed!" 8
-	exit 1
-}
-=======
+
 # Prune old snapshots - only on specific hours to avoid conflicts
 HOUR=$(date +%H)
 # Only prune between 2-4 AM to reduce multi-device conflicts
@@ -87,7 +71,6 @@ if [ $HOUR -ge 2 ] && [ $HOUR -lt 4 ]; then
 else
 	echo "Skipping prune - only running between 2-4 AM to avoid multi-device conflicts"
 fi
->>>>>>> 606b58c (Release v1.1.0: Critical multi-device fixes for small VPS instances)
 
 
 echo "--- Restic Backup finished at $(date) ---"