Explorar o código

Merge pull request #1476 from prtksxna/patch-1

Remove rebase conflict in README.md
Hakim El Hattab %!s(int64=9) %!d(string=hai) anos
pai
achega
3c46733a54
Modificáronse 1 ficheiros con 0 adicións e 3 borrados
  1. 0 3
      README.md

+ 0 - 3
README.md

@@ -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