Merge branch 'iconpopup' of https://github.com/fabrixxm/friendika into fabrixxm-iconpopup

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 4b25efe418c0b130824aa653f4d13b60e77e0bce..77beabf90434b723941c96900c0d490414bb4385 100644 (file)
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -445,7 +445,7 @@ function dfrn_poll_content(&$a) {
                                        'sec' => $sec
                                ));
                        }
-
+                       
                        $profile = $r[0]['nickname'];
 
                        switch($destination_url) {
@@ -489,6 +489,10 @@ function dfrn_poll_content(&$a) {
                                                dbesc($session_id)
                                        ); 
                                }
+<<<<<<< HEAD
+=======
+                               
+>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
                        
                                goaway($dest);
                        }