mexon/friendica
1
0
Fork 0
Code Pull requests Activity

missed merge conflict tag

Browse source
This commit is contained in:
Friendika 2011-04-04 01:26:04 -07:00
parent 379af25215
commit 94881c15d3
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/dfrn_poll.php
View file

@ -489,10 +489,6 @@ function dfrn_poll_content(&$a) {
dbesc($session_id)
);
}
<<<<<<< HEAD
=======
>>>>>>> 890753e5b545ca5777c6c9084e99cacf42a3b485
goaway($dest);
}