- fixed spare merge conflict line

Marius Burkard · Marius Burkard · commit abcae111ff71 · 2018-11-12T10:07:56.000+01:00
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
@@ -536,7 +536,6 @@ public function check_language($language) {
 		}
 	}
 	
->>>>>>> ispconfig3.official/master
 }
 
 ?>

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,6 @@ public function check_language($language) {`
`536`	`536`	`}`
`537`	`537`	`}`
`538`	`538`
`539`		`->>>>>>> ispconfig3.official/master`
`540`	`539`	`}`
`541`	`540`
`542`	`541`	`?>`