Merge commit '767d99b5bffc9fd188b1fbd1b67aef20014bc1b7'

This commit is contained in:
Tom Preston-Werner 2008-12-10 15:56:00 -08:00
commit 3fe1381dca
1 changed files with 6 additions and 2 deletions

View File

@ -12,7 +12,11 @@ require 'time'
# 3rd party # 3rd party
require 'liquid' require 'liquid'
require 'redcloth' require 'redcloth'
require 'rdiscount' rescue puts "The rdiscount gem is required for markdown support!" begin
require 'rdiscount'
rescue LoadError
puts "The rdiscount gem is required for markdown support!"
end
require 'classifier' require 'classifier'
require 'directory_watcher' require 'directory_watcher'
@ -31,4 +35,4 @@ module Jekyll
def self.process(source, dest) def self.process(source, dest)
Jekyll::Site.new(source, dest).process Jekyll::Site.new(source, dest).process
end end
end end