Fix merge problem

55fe213f · Olivier Berger · ca141752 · 55fe213f
Commit 55fe213f authored 13 years ago by Olivier Berger
--- 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