Resolve conflict

This commit is contained in:
John Goerzen
2007-10-13 07:07:30 +01:00
2 changed files with 12 additions and 5 deletions

View File

@ -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
##################################################