resolve my own merge conflicts.
This commit is contained in:
parent
736b179888
commit
805a9eb921
1 changed files with 0 additions and 3 deletions
|
|
@ -1,5 +1,4 @@
|
||||||
require 'erb'
|
require 'erb'
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
module Diaspora
|
module Diaspora
|
||||||
module Markdownify
|
module Markdownify
|
||||||
|
|
@ -139,11 +138,9 @@ module Diaspora
|
||||||
%Q{[#{content}](#{link}#{title_chunk})}
|
%Q{[#{content}](#{link}#{title_chunk})}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
return full_document
|
return full_document
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def single_emphasis(text)
|
def single_emphasis(text)
|
||||||
"<em>#{text}</em>"
|
"<em>#{text}</em>"
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue