diff options
| author | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-11 10:02:40 +0100 |
|---|---|---|
| committer | Hakim El Hattab <hakim.elhattab@gmail.com> | 2016-01-11 10:02:40 +0100 |
| commit | 3c46733a544e6fbd9754787bf2fd24ebf9fe5e8d (patch) | |
| tree | 20ff377ee5e92fb6f014f9558bebe57b0cae4004 | |
| parent | c3919756f1a50fe696d7b690c64f0c9e7f5f6c62 (diff) | |
| parent | 7eca84254ea5a38829a145a86807a93e50c45ce4 (diff) | |
| download | fosdem-2018-presentation-3c46733a544e6fbd9754787bf2fd24ebf9fe5e8d.tar fosdem-2018-presentation-3c46733a544e6fbd9754787bf2fd24ebf9fe5e8d.tar.gz | |
Merge pull request #1476 from prtksxna/patch-1
Remove rebase conflict in 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 |