Commit abcae111 authored by Marius Burkard's avatar Marius Burkard

- fixed spare merge conflict line

parent d8193946
......@@ -536,7 +536,6 @@ class functions {
}
}
>>>>>>> ispconfig3.official/master
}
?>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment