Fix merge problem

diff --git a/handlers/dup.in b/handlers/dup.in
index 29fd866e62b195a8cd0afc206311aedf7e6cfff0..b58d34d80908e3e0780501292d622c788da78fd0 100644 (file)
--- 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