Remove rebase conflict in README.md
parent
c3919756f1
commit
7eca84254e
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue