Resolve conflict

[offlineimap] / offlineimap.conf

diff --git a/offlineimap.conf b/offlineimap.conf
index b02dba4ce69b0de26cd1da192eb47e4914c86fbe..4351d0d531a57ce34fb150556b4a6d1ee17cd5ff 100644 (file)
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@ -129,6 +129,11 @@ footer = "\n"
 # Note that this filter can be used only to further restrict mbnames
 # to a subset of folders that pass the account's folderfilter.
 
+[ui.Curses.Blinkenlights]
+# Character used to indicate thread status.
+
+statuschar = .
+
 ##################################################
 # Accounts
 ##################################################