Permalink
Browse files

Delete conflict cruft

  • Loading branch information...
1 parent 564173b commit f26d08ed0f083607af9cfc42ca2c379bd43fc84d @kytrinyx kytrinyx committed Jun 22, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 _posts/2012-06-13-conferences-with-open-cfps.md
@@ -59,7 +59,6 @@ JS.everywhere | san jose. 26 - 27 october 2012
##[Full Frontal](http://2012.full-frontal.org/)
-<<<<<<< HEAD
Apply [here](http://2012.full-frontal.org/#talk). Closing on 7th November.
full frontal | brighton. 9 november 2012

0 comments on commit f26d08e

Please sign in to comment.