fixed closing time

[libreplanet-static.git] / 2019 / includes / generated-sessions.html

diff --git a/2019/includes/generated-sessions.html b/2019/includes/generated-sessions.html
index 1e96ff0dbd9894182914e0a70b0513dd469bf9b8..5259de93b5854baf8092ce89bf5239a4815393bf 100644 (file)
--- a/2019/includes/generated-sessions.html
+++ b/2019/includes/generated-sessions.html
@@ -742,11 +742,7 @@ were not a concern.</p>
 <article class="program-timeslot" id="day-1-timeslot-16">
 <header class="program-timeslot-header">
 <hgroup>
-<<<<<<< HEAD
 <h2>17:15 - 18:00: Free Software Awards, with Richard Stallman</h2>
-=======
-<h2>17:15 - 18:15: Free Software Awards, with Richard Stallman</h2>
->>>>>>> 28c73e5eec3b6185b8c7b27c8909d754977f98e4
 </hgroup>
 </header>
 <section class="program-session" id="day-1-timeslot-16-session-1">