summaryrefslogtreecommitdiff
path: root/mutt/mailboxes
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-03-13 12:14:59 +0000
committerUrbain Vaes <urbain@vaes.uk>2015-03-13 12:14:59 +0000
commitb4b6ad8508f11e703c300cb9ddf2cade876b318e (patch)
tree6ed97284bab0543d51b6000cddf472720b482c20 /mutt/mailboxes
parent2163290664136a358648cf968572344d6406580e (diff)
parent94e1faac9f163c66b053e1194e41fdfd633d1a4e (diff)
resolving conflicts
Diffstat (limited to 'mutt/mailboxes')
-rw-r--r--mutt/mailboxes2
1 files changed, 1 insertions, 1 deletions
diff --git a/mutt/mailboxes b/mutt/mailboxes
index d259b41..9e64508 100644
--- a/mutt/mailboxes
+++ b/mutt/mailboxes
@@ -1 +1 @@
-mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent"
+mailboxes "+Hotmail/Hotmail" "+Main/Drafts" "+Main/Main" "+Main/Sent" "+Gmail/Gmail" "+Imperial/Imperial"