X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=2019%2Fprogram%2Fgrid-schedule.html;h=0a0ac07c8f3af8cb9eee281330acbf363197f949;hb=288a048423bdb2ca8f9d76374c0fb5977621ed21;hp=e2eb2d540fa64b3266d47d19f89f632ebfbcf371;hpb=ddeaa98b4b67f2356c5f1a20d75028971545d996;p=libreplanet-static.git

diff --git a/2019/program/grid-schedule.html b/2019/program/grid-schedule.html
old mode 100644
new mode 100755
index e2eb2d54..0a0ac07c
--- a/2019/program/grid-schedule.html
+++ b/2019/program/grid-schedule.html
@@ -4,7 +4,6 @@
 
 <!--#include virtual="/2019/includes/banner.html"-->
 <!--#include virtual="/2019/includes/sidebar.html"-->
-<!--#include virtual="/2019/includes/program-menu.html"-->
 
 <h1>Saturday</h1>
 
@@ -62,7 +61,7 @@
     <td class="tg-ao2g">14:30</td>
     <td class="tg-ao2g">The Tor Project: State of the onion<br></td>
     <td class="tg-ao2g">Free APIs: The next generation</td>
-    <td class="tg-ao2g">Hackerspace Rancho Electronico</td>
+    <td class="tg-ao2g">Hackerspace Rancho Electrónico</td>
   </tr>
   <tr>
     <td class="tg-jnby">15:25</td>
@@ -72,7 +71,7 @@
   </tr>
   <tr>
     <td class="tg-ao2g">16:20</td>
-    <td class="tg-ao2g">Digital rights in Australia</td>
+    <td class="tg-ao2g">Australia's decryption law and free software</td>
     <td class="tg-ao2g">Free software in the 3D printing community</td>
     <td class="tg-ao2g">Copying files between computers</td>
   </tr>
@@ -80,6 +79,11 @@
     <td class="tg-jnby">17:15</td>
     <td class="tg-jnby" colspan="3">Keynote &amp; Free Software Awards - Richard Stallman</td>
   </tr>
+  <tr>
+    <td class="tg-ao2g">18:00</td>
+    <td class="tg-ao2g" colspan="3"> Closing</td>
+  </tr>
+    
 </table>
 
 <h1>Sunday</h1>
@@ -122,7 +126,7 @@
   <tr>
     <td class="tg-jnby">13:35</td>
     <td class="tg-jnby">Library Freedom Institute: A new hope<br></td>
-    <td class="tg-jnby">TechWhat do courts think (so far) the GPL means?</td>
+    <td class="tg-jnby">What do courts think (so far) the GPL means?</td>
     <td class="tg-jnby">The joy of bug reporting<br></td>
   </tr>
   <tr>
@@ -147,13 +151,21 @@
     <td class="tg-jnby">17:15</td>
     <td class="tg-jnby" colspan="3">Keynote - Bdale Garbee</td>
   </tr>
+    <tr>
+    <td class="tg-ao2g">18:00</td>
+    <td class="tg-ao2g" colspan="3"> Closing</td>
+  </tr>
 </table>
 
 
 <!--#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" -->