removes conflict marker
[tine20] / 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