From dae6dcffa2e1b7c9907e09927ba50859ab4699f7 Mon Sep 17 00:00:00 2001
From: Dana Morgenstein <danam@freestation11.office.fsf.org>
Date: Wed, 20 Mar 2019 12:26:42 -0400
Subject: [PATCH] fixed closing time

---
 2019/includes/generated-sessions.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/2019/includes/generated-sessions.html b/2019/includes/generated-sessions.html
index 1e96ff0d..5259de93 100644
--- 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">
-- 
2.25.1