Permalink
Browse files

Merge pull request #417 from chjj/marked

attempt to require marked for markdown filter
  • Loading branch information...
2 parents d4ea21d + 3d7153f commit b25fcbb54bd55c510909608d9d11a110ab8401fe @tj tj committed Dec 29, 2011
Showing with 6 additions and 1 deletion.
  1. +6 −1 lib/filters.js
View
7 lib/filters.js
@@ -71,7 +71,12 @@ module.exports = {
try {
md = require('markdown-js');
} catch (err) {
- throw new Error('Cannot find markdown library, install markdown or discount');
+ try {
+ md = require('marked');
+ } catch (err) {
+ throw new
+ Error('Cannot find markdown library, install markdown, discount, or marked.');
+ }
}
}
}

0 comments on commit b25fcbb

Please sign in to comment.