Hakim El Hattab 8582c9aac8 resolve notes merge conflict

2018-10-04 12:32:37 +02:00

..

reveal.js

resolve notes merge conflict

2018-10-04 12:32:37 +02:00