Merge remote-tracking branch 'upstream/develop' into 1612-unused-indexes

[friendica.git] / mod / hcard.php

diff --git a/mod/hcard.php b/mod/hcard.php
index 8d79dd054634b8f9aab8fb71857fb0b2ba3ff9f5..d53405009a6fda34ebadaf3e447c605223c76134 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -47,11 +47,7 @@ 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";
        }