From: Molly de Blanc <molly@fsf.org>
Date: Thu, 7 Mar 2019 16:28:53 +0000 (-0500)
Subject: messing around with git.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9eacb7223ce104a15f1cca39a93a351d47f0e9ab;p=libreplanet-static.git

messing around with git.
---

9eacb7223ce104a15f1cca39a93a351d47f0e9ab
diff --cc 2019/program/grid-schedule.html
index a7b1d00a,2a0b6b77..d7412c39
mode 100644,100755..100755
--- a/2019/program/grid-schedule.html
+++ b/2019/program/grid-schedule.html
@@@ -151,6 -152,7 +151,12 @@@
  
  <!--#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" -->