nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

oops. left a merge conflict in

Browse source
This commit is contained in:
Brian Wisti 2011-08-16 23:01:08 -07:00
parent 8f78a2d977
commit a442e7c8ae
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/diaspora/markdownify.rb
View file

@ -138,10 +138,6 @@ module Diaspora
%Q{[#{content}](#{link}#{title_chunk})} %Q{[#{content}](#{link}#{title_chunk})}
end end
<<<<<<< HEAD
=======
>>>>>>> 6b34a2611da25c7af1c2bcd41c3f8cb326df01a7
return full_document return full_document
end end