From 94881c15d38d8e02b736060e9707643c56c58ea0 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 4 Apr 2011 01:26:04 -0700
Subject: [PATCH] missed merge conflict tag

---
 mod/dfrn_poll.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 77beabf904..5149dc3b21 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);
 			}