[ciderwebmail] 01/03: cleanup merge conflict

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag release-1.05
in repository ciderwebmail.

commit d7ebf046e4ff688d5f6a821cf2d45a124717e438
Author: Mathias Reitinger <mathias.reitinger at loop0.org>
Date:   Wed Oct 22 16:57:42 2014 +0200

    cleanup merge conflict
---
 lib/CiderWebmail/Error.pm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/CiderWebmail/Error.pm b/lib/CiderWebmail/Error.pm
index 1a06dbc..fc583c9 100644
--- a/lib/CiderWebmail/Error.pm
+++ b/lib/CiderWebmail/Error.pm
@@ -10,11 +10,7 @@ CiderWebmail::Error - Error Handling in CiderWebmail
 
 =head1 DESCRIPTION
 
-<<<<<<< HEAD
-Base class for CiderWebmail exceptions. 
-=======
 Implements the base class for CiderWebmail exceptions. 
->>>>>>> begin implementing exception handling
 
 =cut
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ciderwebmail.git