From 276f46fce20fbc10a5d16d2e8dbfb701b3c30e52 Mon Sep 17 00:00:00 2001
From: Mikael Roos <mikael.t.h.roos@gmail.com>
Date: Mon, 7 Dec 2015 17:35:53 +0100
Subject: [PATCH] merged img.php

---
 webroot/img.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/webroot/img.php b/webroot/img.php
index 8b3c84f..c3586ce 100644
--- a/webroot/img.php
+++ b/webroot/img.php
@@ -1011,11 +1011,7 @@ if ($srgb || $srgbDefault) {
     $filename = $img->convert2sRGBColorSpace(
         $srcImage,
         $imagePath,
-<<<<<<< HEAD
-        $srgbDir,
-=======
         $cache->getPathToSubdir("srgb"),
->>>>>>> master
         $srgbColorProfile,
         $useCache
     );