From b534a2f84b344add8b04c14e11b8f35d147c362e Mon Sep 17 00:00:00 2001 From: Thomas Cataldo Date: Sat, 18 May 2013 16:26:42 +0200 Subject: [PATCH] remove conflict marks --- lib/imapoptions | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/imapoptions b/lib/imapoptions index c049501..352ab60 100644 --- a/lib/imapoptions +++ b/lib/imapoptions @@ -678,11 +678,7 @@ Blank lines and lines beginning with ``#'' are ignored. { "mboxkey_db", "skiplist", STRINGLIST("berkeley", "skiplist") } /* The cyrusdb backend to use for mailbox keys. */ -<<<<<<< HEAD -{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")} -======= { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist", "sql")} ->>>>>>> eeed0db... Allow SQL backend for mboxlist and statuscache /* The cyrusdb backend to use for the mailbox list. */ { "mboxlist_db_path", NULL, STRING } @@ -1234,11 +1230,7 @@ product version in the capabilities */ { "statuscache", 0, SWITCH } /* Enable/disable the imap status cache. */ -<<<<<<< HEAD -{ "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist") } -======= { "statuscache_db", "skiplist", STRINGLIST("berkeley", "berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist", "sql") } ->>>>>>> eeed0db... Allow SQL backend for mboxlist and statuscache /* The cyrusdb backend to use for the imap status cache. */ { "statuscache_db_path", NULL, STRING } -- 1.7.9.5