From c6a1053dd8b81edda7c75da484dc6cfcea8c5e27 Mon Sep 17 00:00:00 2001
From: Molly de Blanc <molly@fsf.org>
Date: Sat, 23 Mar 2019 09:09:42 -0400
Subject: [PATCH] updated info to include associate members' meeting.

---
 2019/includes/generated-sessions.html | 2 +-
 2019/program/grid-schedule.html       | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/2019/includes/generated-sessions.html b/2019/includes/generated-sessions.html
index d6fb4fae..96cd02ab 100644
--- a/2019/includes/generated-sessions.html
+++ b/2019/includes/generated-sessions.html
@@ -1058,7 +1058,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 67d8321d..89ba354d 100755
--- 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" -->
-- 
2.25.1