After updating using the provided update.sh script the Mailcow gui fails to load properly. Inspecting the returned data using my browser I noticed this being returned for all requests to /api/v1/…:
Parse error: syntax error, unexpected ‘<<’ (T_SL) in /web/json_api.php on line 48
Inspecting the json_api.php file shows this at line 48:
`if (isset($_GET[‘query’])) {
<<<<<<< HEAD
$query = explode(‘/’, $_GET[‘query’]);
$action = (isset($query[0])) ? $query[0] : null;
$category = (isset($query[1])) ? $query[1] : null;
$object = (isset($query[2])) ? $query[2] : null;
$extra = (isset($query[3])) ? $query[3] : null;
// accept json in request body
if(strpos($_SERVER[‘HTTP_CONTENT_TYPE’], ‘application/json’) !== false) {
$request = file_get_contents(‘php://input’);
$requestDecoded = json_decode($request, true);
=======
$query = explode(‘/’, $_GET[‘query’]);
$action = (isset($query[0])) ? $query[0] : null;
$category = (isset($query[1])) ? $query[1] : null;
$object = (isset($query[2])) ? $query[2] : null;
$extra = (isset($query[3])) ? $query[3] : null;
// accept json in request body
if(strpos($_SERVER[‘HTTP_CONTENT_TYPE’], ‘application/json’) !== false) {
$request = file_get_contents(‘php://input’);
$requestDecoded = json_decode($request, true);
>>>>>>> 530d67344ec689c78019432e9aacac8656f406fe`
This does not seem right.
Does anybody else have this problem?