# HG changeset patch
# User Zachary Kotlarek <zach@kotlarek.com>
# Date 1362957245 25200
# Node ID 82f9ed7a8ccebd828d754b93658f321fa6bae339
# Parent  14096395dd930d476cdc233a3c62784554176236
One more time?

diff -r 14096395dd93 -r 82f9ed7a8cce MailOpener.toc
--- 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