X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fproxy.php;h=8046e4e9639eabc0fd9331d13792543a60908134;hb=8ce20f975c7fc1c27d1981234aefc93b0e7b662a;hp=a8c24cf0886831e878ba39c1aba13c5f8c769cb2;hpb=d80b82c55d912f4de356923d504fc7594c89918b;p=friendica.git

diff --git a/mod/proxy.php b/mod/proxy.php
index a8c24cf088..8046e4e963 100644
--- a/mod/proxy.php
+++ b/mod/proxy.php
@@ -141,23 +141,11 @@ function proxy_init(App $a) {
 	if (!$direct_cache AND ($cachefile == '')) {
 		$r = qu("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash);
 		if (dbm::is_result($r)) {
-<<<<<<< HEAD
-<<<<<<< origin/rewrites/app_get_baseurl_static
-        		$img_str = $r[0]['data'];
-			$mime = $r[0]["desc"];
-			if ($mime == "") $mime = "image/jpeg";
-=======
-=======
->>>>>>> upstream/develop
 			$img_str = $r[0]['data'];
 			$mime = $r[0]['desc'];
 			if ($mime == '') {
 				$mime = 'image/jpeg';
 			}
-<<<<<<< HEAD
->>>>>>> HEAD~0
-=======
->>>>>>> upstream/develop
 		}
 	}