From: Olivier Berger <oberger@ouvaton.org>
Date: Mon, 25 Apr 2011 20:29:57 +0000 (+0200)
Subject: Fix merge problem
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=55fe213f9b968fc0a909adea57710e3ab7540230;p=backupninja.git

Fix merge problem
---

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