jan/revproxy-presentation
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

resolve conflict

Browse source
This commit is contained in:
Hakim El Hattab 2016-01-08 10:48:10 +01:00
commit c3919756f1
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
README.md
View file

@ -590,15 +590,18 @@ Reveal.addEventListener( 'fragmenthidden', function( event ) {
### Code syntax highlighting ### 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.
=======
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 ```html
<section> <section>
<pre><code data-trim> <pre><code data-trim data-noescape>
(def lazy-fib (def lazy-fib
(concat (concat
[0 1] [0 1]
((fn rfib [a b] <mark>((fn rfib [a b]</mark>
(lazy-cons (+ a b) (rfib b (+ a b)))) 0 1))) (lazy-cons (+ a b) (rfib b (+ a b)))) 0 1)))
</code></pre> </code></pre>
</section> </section>