diff options
| author | Prateek Saxena <prtksxna@gmail.com> | 2016-01-11 05:19:28 +0530 |
|---|---|---|
| committer | Prateek Saxena <prtksxna@gmail.com> | 2016-01-11 05:19:28 +0530 |
| commit | 7eca84254ea5a38829a145a86807a93e50c45ce4 (patch) | |
| tree | 20ff377ee5e92fb6f014f9558bebe57b0cae4004 /README.md | |
| parent | c3919756f1a50fe696d7b690c64f0c9e7f5f6c62 (diff) | |
| download | fosdem-2018-presentation-7eca84254ea5a38829a145a86807a93e50c45ce4.tar fosdem-2018-presentation-7eca84254ea5a38829a145a86807a93e50c45ce4.tar.gz | |
Remove rebase conflict in README.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -590,9 +590,6 @@ Reveal.addEventListener( 'fragmenthidden', function( event ) { ### Code syntax highlighting -<<<<<<< HEAD -By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present surrounding whitespace is automatically removed. -======= By default, Reveal is configured with [highlight.js](https://highlightjs.org/) for code syntax highlighting. Below is an example with clojure code that will be syntax highlighted. When the `data-trim` attribute is present, surrounding whitespace is automatically removed. HTML will be escaped by default. To avoid this, for example if you are using `<mark>` to call out a line of code, add the `data-noescape` attribute to the `<code>` element. ```html |