git.fiddlerwoaroof.com
Browse code

fixing conflicts

Ed L authored on 28/10/2014 20:28:42
Showing 2 changed files
... ...
@@ -11,7 +11,7 @@ The input file is any old pandoc markdown file.  The base template is specified
11 11
 lookup's root: it defaults to "base.html".  Running this command will spit out a static page that contains
12 12
 the rendered markdown.  The cool thing about this is that pandoc will convert Latex math expressions like
13 13
 `$x_2 + \frac{1}{2}x_{1}^{2}$` into the MathJaX equivalent: if you run this file through the blog generator,
14
-you'd get: $x_2 + \frac{1}{2}x_{1}^{2}$
14
+you'd get: $x_2 + \frac{1}{2}x_{1}^{2}$ (for example, see <raw/master/processed_README.html>)
15 15
 
16 16
 ### Installation
17 17
 
... ...
@@ -1,2 +1,3 @@
1 1
 Mako==1.0.0
2 2
 MarkupSafe==0.23
3
+pyandoc==0.0.1