diff options
| author | Friendika <info@friendika.com> | 2011-04-04 01:26:04 -0700 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-04-04 01:26:04 -0700 |
| commit | 94881c15d38d8e02b736060e9707643c56c58ea0 (patch) | |
| tree | b159b68548c57309e95c48564a702558053d3ceb /mod/dfrn_poll.php | |
| parent | 379af2521559c263622348bce41872b61067e532 (diff) | |
| download | volse-hubzilla-94881c15d38d8e02b736060e9707643c56c58ea0.tar.gz volse-hubzilla-94881c15d38d8e02b736060e9707643c56c58ea0.tar.bz2 volse-hubzilla-94881c15d38d8e02b736060e9707643c56c58ea0.zip | |
missed merge conflict tag
Diffstat (limited to 'mod/dfrn_poll.php')
| -rw-r--r-- | mod/dfrn_poll.php | 4 |
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); } |