aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--handlers/dup.in5
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