aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/dfrn_poll.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 77beabf90..5149dc3b2 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -489,10 +489,6 @@ function dfrn_poll_content(&$a) {
dbesc($session_id)
);
}
-<<<<<<< HEAD
-=======
-
->>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
goaway($dest);
}