Merge branch 'master' of vcs.fsf.org:libreplanet-static

diff --git a/2019/includes/generated-sessions.html b/2019/includes/generated-sessions.html
index 5259de93b5854baf8092ce89bf5239a4815393bf..a8c45e1039e4a9d4ed5be531c49cea63d48cacc7 100644 (file)
--- a/2019/includes/generated-sessions.html
+++ b/2019/includes/generated-sessions.html
@@ -1085,7 +1085,7 @@ guidelines or codes of conduct.</p>
 <article class="program-timeslot" id="day-2-timeslot-7">
 <header class="program-timeslot-header">
 <hgroup>
-<h2>12:35 - 13:35: Lunch</h2>
+<h2>12:35 - 13:35: Lunch and <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/sunday_members_lunch">Associate members' meeting</a></h2>
 </hgroup>
 </header>
 </article> <!-- day-2-timeslot-7 end -->

diff --git a/2019/program/grid-schedule.html b/2019/program/grid-schedule.html
index 8223618b66ce92703361c0e29eb76d69df166935..b738a8a6b88cea763bf57175ce33c09fb9301ff2 100755 (executable)
--- a/2019/program/grid-schedule.html
+++ b/2019/program/grid-schedule.html
@@ -125,7 +125,7 @@
   </tr>
   <tr>
     <td class="tg-ao2g"><br>12:35</td>
-    <td class="tg-ao2g" colspan="3">Lunch</td>
+    <td class="tg-ao2g" colspan="3">Lunch and <a href="https://libreplanet.org/wiki/LibrePlanet:Conference/2019/sunday_members_lunch">Associate members' meeting</a></td>
   </tr>
   <tr>
     <td class="tg-jnby">13:35</td>
@@ -164,12 +164,8 @@
 
 <!--#include virtual="/2019/includes/footer.html"-->
 <!--#include virtual="/2019/includes/common_js.html"-->
-<<<<<<< HEAD
 <!--#include virtual="/2019/includes/program_js.html"-->
-
-=======
 <script type="text/javascript">
 $("#p-grid-sch").addClass("active").text("Grid Schedule");
 </script>
->>>>>>> 11f1da5c36cf1aec031e587ea41073b7b6db7506
 <!--#include virtual="/2019/includes/close.html" -->