From 8f8cfcd642197b6907548e2b1ec55980948affd3 Mon Sep 17 00:00:00 2001
From: Michael <oldiesmann@gmail.com>
Date: Sat, 2 Dec 2023 21:15:25 -0500
Subject: [PATCH] This should fix merge conflicts

---
 Sources/Actions/Admin/ACP.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Sources/Actions/Admin/ACP.php b/Sources/Actions/Admin/ACP.php
index 876c3ef9ef..147d0b1702 100644
--- a/Sources/Actions/Admin/ACP.php
+++ b/Sources/Actions/Admin/ACP.php
@@ -1512,8 +1512,7 @@ public static function getServerVersions($checkFor)
 		}
 
 		// Why not have a look at ImageMagick? If it's installed, we should show version information for it too.
-		if (in_array('imagemagick', $checkFor) && class_exists('Imagick'))
-		{
+		if (in_array('imagemagick', $checkFor) && class_exists('Imagick')) {
 			$temp = new \Imagick();
 			$temp2 = $temp->getVersion();
 			$im_version = $temp2['versionString'];