Use diff3 conflicts.

[~madcoder/dotfiles.git] / muttrc

diff --git a/muttrc b/muttrc
index e7dbf23..68ee160 100644 (file)
--- a/muttrc
+++ b/muttrc
@@ -62,7 +62,6 @@ set   mbox=imaps://hermes.madism.org/
 set   postponed==drafts
 
 subscribe imaps://imap.mail.intersec.com/INBOX
-subscribe imaps://imap.mail.intersec.com/commits
 
 # regexpes
 set   mask=.