From 9b6ad2fc4754185708d00d3be4c4a2aebcb73e7e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Tue, 20 Dec 2016 10:39:06 +0100
Subject: [PATCH] Coding convention: - added curly braces - added space between
 "if" and brace - also added TODO (old-lost code?)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@mxchange.org>
---
 mod/hcard.php    | 4 ++++
 mod/noscrape.php | 1 +
 mod/profile.php  | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/mod/hcard.php b/mod/hcard.php
index d53405009a..8d79dd0546 100644
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -47,7 +47,11 @@ function hcard_init(App &$a) {
 	header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+<<<<<<< upstream/develop
 	foreach ($dfrn_pages as $dfrn) {
+=======
+	foreach($dfrn_pages as $dfrn) {
+>>>>>>> HEAD~65
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}
 
diff --git a/mod/noscrape.php b/mod/noscrape.php
index 758ce8ba53..33255f0fa4 100644
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -26,6 +26,7 @@ function noscrape_init(App &$a) {
 	$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
 	$keywords = explode(',', $keywords);
 
+	/// @TODO This query's result is not being used (see below), maybe old-lost code?
 	$r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
 		intval($a->profile['uid']));
 
diff --git a/mod/profile.php b/mod/profile.php
index 8519f7e82e..28b508dc0e 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -62,7 +62,11 @@ function profile_init(App &$a) {
 	header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
 
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
+<<<<<<< upstream/develop
 	foreach ($dfrn_pages as $dfrn) {
+=======
+	foreach($dfrn_pages as $dfrn) {
+>>>>>>> HEAD~65
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
 	}
 	$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";
-- 
2.39.5