Mercurial > wow > mailopener

diff MailOpener.toc @ 174:463e29ca6b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More merging'
author Zachary Kotlarek <zach@kotlarek.com>
date Sun, 10 Mar 2013 16:08:39 -0700
parents 135e5ef42f2b f401a8ac72fe
children 82f9ed7a8cce
line wrap: on
line diff
--- a/MailOpener.toc	Sun Mar 10 15:59:03 2013 -0700
+++ b/MailOpener.toc	Sun Mar 10 16:08:39 2013 -0700
@@ -1,7 +1,11 @@
 ## Interface: 50200
 ## Title: Mail Opener
 ## Notes: Mail Opener will automatically retrieve all your mail from the mailbox.
+<<<<<<< local
 ## Author: Zerotorescue, profplump
+=======
+## Author: Zerotorescue (at EU - Al'Akir), profplump
+>>>>>>> other
 ## Version: @project-version@
 ## SavedVariables: MailOpenerDB
 ## LoadManagers: AddonLoader