fix merge error, closes #3277
This commit is contained in:
parent
8a97ad58b0
commit
c1c4145240
|
@ -1,9 +1,5 @@
|
|||
/*!
|
||||
<<<<<<< HEAD
|
||||
* reveal.js 4.3.1
|
||||
=======
|
||||
* reveal.js 4.1.3
|
||||
>>>>>>> 62a85d55f8820c93dd2e60e34600b6eded8f7726
|
||||
* https://revealjs.com
|
||||
* MIT licensed
|
||||
*
|
||||
|
|
Loading…
Reference in New Issue