removes conflict marker
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:33:23 +0000 (11:33 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 6 Aug 2015 09:33:23 +0000 (11:33 +0200)
Change-Id: I3d31fc9774e2f28afab3ac7a9a9a21508c8c738d

tine20/Tinebase/User/Sql.php

index bb56c98..5ed705c 100644 (file)
@@ -1063,7 +1063,6 @@ class Tinebase_User_Sql extends Tinebase_User_Abstract
     }
 
     /**
     }
 
     /**
-<<<<<<< HEAD
      * send deactivation email to user
      * 
      * @param mixed $accountId
      * send deactivation email to user
      * 
      * @param mixed $accountId