From: John Goerzen <jgoerzen@complete.org>
Date: Sat, 13 Oct 2007 06:07:30 +0000 (+0100)
Subject: Resolve conflict
X-Git-Tag: DEBIAN_offlineimap_5.99.3~11
X-Git-Url: https://code.delx.au/offlineimap/commitdiff_plain/6949a311647932f2968e181cd78f23c9f7493106

Resolve conflict
---

6949a311647932f2968e181cd78f23c9f7493106
diff --cc offlineimap.conf
index b02dba4,cdba6a7..4351d0d
--- a/offlineimap.conf
+++ b/offlineimap.conf
@@@ -129,6 -116,37 +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.
  
 -##################################################
 -# Blinkenlights configuration
 -##################################################
 -
 -[ui.Tk.Blinkenlights]
 -
 -# Specifies the default number of lines in the log.
 -
 -loglines = 5
 -
 -# Specifies how many lines are in the scrollback log buffer.
 -
 -bufferlines = 500
 -
 -# If true, says that the log should be enabled by default.
 -# Otherwise, you have to click "Show Log" to enable the log.
 -
 -showlog = false
 -
 -# Sets the font information.
 -
 -fontfamily = Helvetica
 -fontsize = 8
 -
+ [ui.Curses.Blinkenlights]
 -
 -# Character used to indicate thread status, in place of
 -# the LEDs from Tk.Blinkenlights
++# Character used to indicate thread status.
+ 
+ statuschar = .
+ 
  ##################################################
  # Accounts
  ##################################################