michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-08-14 19:40:36 +01:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Jamie Cameron
2026-02-10 10:24:58 -08:00
parent 3713ee01b8
commit 3a1ea4682d
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apache/restart.cgi
View File

@@ -34,13 +34,8 @@ if (!$running) {
&error($text{'restart_eunknown'});
}
else {
<<<<<<< HEAD
$errorlog = &server_root($errorlog, $conf);
$out = &backquote_command("tail -5 ".quotemeta($errorlog));
=======
$errorlog = &server_root($errorlog);
$out = `tail -5 $errorlog`;
>>>>>>> The server_root function doesn't need the global config as a parameter
$out = &backquote_command("tail -5 ".quotemeta($errorlog));
&error("<pre>$out</pre>");
}
}