Merge remote-tracking branch 'tstone/upstream'

showdownjs · Oct 31, 2012 · fb4fed1 · fb4fed1
2 parents d46f5b5 + 90e51e9
commit fb4fed1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/test/cases/github-style-linebreaks.html b/test/cases/github-style-linebreaks.html
@@ -0,0 +1,4 @@
+
+<pre><code>code can go here
+this is rendered on a second line
+</code></pre>
diff --git a/test/cases/github-style-linebreaks.md b/test/cases/github-style-linebreaks.md
@@ -0,0 +1,4 @@
+```
+code can go here
+this is rendered on a second line
+```