From 3a1ea4682de699b780c32452ecb3c13c4367a4fb Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Tue, 10 Feb 2026 10:24:58 -0800
Subject: [PATCH] Fix merge conflict

---
 apache/restart.cgi | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apache/restart.cgi b/apache/restart.cgi
index 4fc714ef7..08f2c8c84 100755
--- a/apache/restart.cgi
+++ b/apache/restart.cgi
@@ -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>");
 		}
 	}