Skip to content

Commit

Permalink
Merge commit '767d99b5bffc9fd188b1fbd1b67aef20014bc1b7'
Browse files Browse the repository at this point in the history
  • Loading branch information
mojombo committed Dec 10, 2008
2 parents 3041cf6 + 767d99b commit 3fe1381
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions lib/jekyll.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@
# 3rd party
require 'liquid'
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 'directory_watcher'

Expand All @@ -31,4 +35,4 @@ module Jekyll
def self.process(source, dest)
Jekyll::Site.new(source, dest).process
end
end
end

0 comments on commit 3fe1381

Please sign in to comment.