diff options
author | Urbain Vaes <urbain@vaes.uk> | 2015-03-27 15:31:32 +0000 |
---|---|---|
committer | Urbain Vaes <urbain@vaes.uk> | 2015-03-27 15:31:32 +0000 |
commit | 53203ab62154cd7c337ada62bf06094adc05325e (patch) | |
tree | d7a49268837e721ac7cae7f4925109e30ae38a55 /mutt | |
parent | 72de482ee4fa06bc096f70be5b2a12e10451068f (diff) | |
parent | 02d2513655c0e94ac362791384d17372701e606e (diff) |
Resolving conflicts
Diffstat (limited to 'mutt')
-rw-r--r-- | mutt/mailboxes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mutt/mailboxes b/mutt/mailboxes index 9e64508..d259b41 100644 --- a/mutt/mailboxes +++ b/mutt/mailboxes @@ -1 +1 @@ -mailboxes "+Hotmail/Hotmail" "+Main/Drafts" "+Main/Main" "+Main/Sent" "+Gmail/Gmail" "+Imperial/Imperial" +mailboxes "+Gmail/Gmail" "+Hotmail/Hotmail" "+Imperial/Imperial" "+Main/Drafts" "+Main/Main" "+Main/Sent" |