From c1c4145240270380140d0794bf1bfbfca6b3e101 Mon Sep 17 00:00:00 2001 From: hakimel Date: Wed, 14 Sep 2022 14:14:42 +0200 Subject: [PATCH] fix merge error, closes #3277 --- dist/reveal.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dist/reveal.css b/dist/reveal.css index 4dcc71b..843199a 100644 --- a/dist/reveal.css +++ b/dist/reveal.css @@ -1,9 +1,5 @@ /*! -<<<<<<< HEAD * reveal.js 4.3.1 -======= -* reveal.js 4.1.3 ->>>>>>> 62a85d55f8820c93dd2e60e34600b6eded8f7726 * https://revealjs.com * MIT licensed *