merge

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

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