From 55fe213f9b968fc0a909adea57710e3ab7540230 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Mon, 25 Apr 2011 22:29:57 +0200 Subject: Fix merge problem --- handlers/dup.in | 5 ----- 1 file changed, 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 -- cgit v1.2.3