diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index a1cda41e861e78b243ca37415a7e01fcd693383b..a86057a0647c0544849b97e6d6107c3d33663943 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -536,7 +536,6 @@ class functions {
 		}
 	}
 	
->>>>>>> ispconfig3.official/master
 }
 
 ?>