- fixed spare merge conflict line

abcae111 · Marius Burkard · d8193946 · abcae111
Commit abcae111 authored Nov 12, 2018 by Marius Burkard
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

interface/lib/classes/functions.inc.php interface/lib/classes/functions.inc.php +0 -1

No files found.
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -536,7 +536,6 @@ class functions {
 		}
 	}
 	
->>>>>>> ispconfig3.official/master
 }

 ?>