Skip to content

Commit

Permalink
This should fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Oldiesmann committed Dec 3, 2023
1 parent a86dfac commit 8f8cfcd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Sources/Actions/Admin/ACP.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'];
Expand Down

0 comments on commit 8f8cfcd

Please sign in to comment.