Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Missed a merge

  • Loading branch information...
commit 455db3825c01bbf8f954948dcc9ce095da8933a5 1 parent fc76206
Mark Reid authored
Showing with 2 additions and 13 deletions.
  1. +2 −13 lib/jekyll/convertible.rb
View
15 lib/jekyll/convertible.rb
@@ -36,17 +36,7 @@ def read_yaml(base, name)
#
# Returns nothing
def transform
-<<<<<<< HEAD:lib/jekyll/convertible.rb
- case self.ext[1..-1]
- when /textile/i
- self.ext = ".html"
- self.content = Jekyll.textile(self.content)
- when /markdown/i, /mkdn/i, /md/i
- self.ext = ".html"
- self.content = Jekyll.markdown(self.content)
- end
-=======
- self.content = converter.convert(self.content)
+ self.content = converter.convert(self.content)
end
# Determine the extension depending on content_type
@@ -60,8 +50,7 @@ def output_ext
# extension
def converter
@converter ||= self.site.converters.find { |c| c.matches(self.ext) }
->>>>>>> 5e997cae2111a69870f4a8c6b63c27e860cb8661:lib/jekyll/convertible.rb
- end
+ end
# Add any necessary layouts to this convertible document
# +layouts+ is a Hash of {"name" => "layout"}
Please sign in to comment.
Something went wrong with that request. Please try again.