diff options
| author | Olivier Berger <oberger@ouvaton.org> | 2011-04-25 22:29:57 +0200 |
|---|---|---|
| committer | Olivier Berger <oberger@ouvaton.org> | 2011-04-25 22:40:44 +0200 |
| commit | 55fe213f9b968fc0a909adea57710e3ab7540230 (patch) | |
| tree | cb24aa4f485958e5a112d671a9b884004eac0825 | |
| parent | ca14175210a0f12ef4802f057d07530a989e82f7 (diff) | |
| download | backupninja-55fe213f9b968fc0a909adea57710e3ab7540230.tar.gz backupninja-55fe213f9b968fc0a909adea57710e3ab7540230.tar.bz2 | |
Fix merge problem
| -rw-r--r-- | handlers/dup.in | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/handlers/dup.in b/handlers/dup.in index 29fd866..b58d34d 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -25,13 +25,8 @@ getconf exclude setsection dest getconf incremental yes getconf increments 30 -<<<<<<< HEAD getconf keep 60 getconf keepincroffulls all -======= -getconf keep 1Y -getconf keepincroffulls 6 ->>>>>>> Now that there's some removal of increments for old fulls, we can keep fulls for a longer time, for instance 1Y which becomes default getconf desturl getconf awsaccesskeyid getconf awssecretaccesskey |