Hakim El Hattab 8582c9aac8 resolve notes merge conflict 8 年之前
..
reveal.js 8582c9aac8 resolve notes merge conflict 8 年之前