From: Roland Häder <roland@mxchange.org>
Date: Thu, 22 Dec 2016 08:14:14 +0000 (+0100)
Subject: removed conflict solving remains, took from upstream/develop
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a314dbc56207eff751dbce5c88b055ae8e41ae30;p=friendica.git

removed conflict solving remains, took from upstream/develop

Signed-off-by: Roland Häder <roland@mxchange.org>
---

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
 		}
 	}