diff options
| author | Sam Scholten | 2025-10-22 15:27:48 +1000 |
|---|---|---|
| committer | Sam Scholten | 2025-10-22 15:32:14 +1000 |
| commit | bfcdc1369930fe41d3309ebfffcf5fee17a0b368 (patch) | |
| tree | 17fda145a0ad5e4acd328a2eb627e31bacbee728 /update.sh | |
| parent | 2f65f1be5c0cf37ef8007a1c003274c0c5657728 (diff) | |
| download | drestic-bfcdc1369930fe41d3309ebfffcf5fee17a0b368.tar.gz drestic-bfcdc1369930fe41d3309ebfffcf5fee17a0b368.zip | |
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
Diffstat (limited to 'update.sh')
0 files changed, 0 insertions, 0 deletions