missed merge conflict tag

12 years ago · 94881c15d3
parent 379af25215
commit 94881c15d3
1 changed files with 0 additions and 4 deletions
--- 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);
 			}