diff options
| author | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
|---|---|---|
| committer | Ian Bertolacci <ian.bertolacci@gmail.com> | 2015-10-04 22:02:33 -0600 |
| commit | a9680e9c02a9490549b6939f7cb16fa88a880538 (patch) | |
| tree | af81bebcd9b564dce72f213fe14a17fe4b9032b2 /markdown.html.markdown | |
| parent | 57ea4af17c7ab17e9c32096c2579e0a985e44781 (diff) | |
| parent | ad4d6f3c1e9dfba3933651116535d590a17092df (diff) | |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Fixed down merge-conflict.
Diffstat (limited to 'markdown.html.markdown')
| -rw-r--r-- | markdown.html.markdown | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/markdown.html.markdown b/markdown.html.markdown index 6d19710f..acb808ea 100644 --- a/markdown.html.markdown +++ b/markdown.html.markdown @@ -160,7 +160,7 @@ def foobar end \`\`\` <!-- here too, no backslashes, just ``` --> -<-- The above text doesn't require indenting, plus Github will use syntax +<!-- The above text doesn't require indenting, plus Github will use syntax highlighting of the language you specify after the ``` --> <!-- Horizontal rule (<hr />) --> |