oops. left a merge conflict in

2011-08-16 23:01:08 -07:00 · 2011-08-16 23:01:08 -07:00 · a442e7c8ae
commit a442e7c8ae
parent 8f78a2d977
1 changed files with 0 additions and 4 deletions
--- a/lib/diaspora/markdownify.rb
+++ b/lib/diaspora/markdownify.rb
@ -138,10 +138,6 @@ module Diaspora
          %Q{[#{content}](#{link}#{title_chunk})}
        end

-<<<<<<< HEAD
-=======
-
->>>>>>> 6b34a2611da25c7af1c2bcd41c3f8cb326df01a7
        return full_document
      end