projects / libreplanet-static.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 287946f 28c73e5)
added closing to day one
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Wed, 20 Mar 2019 16:23:48 +0000 (12:23 -0400)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Wed, 20 Mar 2019 16:23:48 +0000 (12:23 -0400)
1  2 
2019/includes/generated-sessions.html patch | diff1 | diff2 | blob | history

diff --cc 2019/includes/generated-sessions.html
index 5259de93b5854baf8092ce89bf5239a4815393bf,433c3234874ac95b8ec65a6c495a9f169e2bcd8b..1e96ff0dbd9894182914e0a70b0513dd469bf9b8
--- 1/2019/includes/generated-sessions.html
--- 2/2019/includes/generated-sessions.html
+++ b/2019/includes/generated-sessions.html
@@@ -742,7 -742,7 +742,11 @@@ 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">