missed merge conflict tag

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 77beabf90434b723941c96900c0d490414bb4385..5149dc3b211afd6b62de6074bd92d3a841c1b1fe 100644 (file)
--- 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);
                        }