Mercurial > wow > mailopener

changeset 177:82f9ed7a8cce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
One more time?
author Zachary Kotlarek <zach@kotlarek.com>
date Sun, 10 Mar 2013 16:14:05 -0700
parents 14096395dd93
children 8cc47edac8ad
files MailOpener.toc
diffstat 1 files changed, 0 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/MailOpener.toc	Sun Mar 10 16:09:57 2013 -0700
+++ b/MailOpener.toc	Sun Mar 10 16:14:05 2013 -0700
@@ -1,11 +1,7 @@
 ## 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