messing around with git.

diff --cc 2019/program/grid-schedule.html
index a7b1d00adcfd7dd2aff242912e4c6988f0275e3c,2a0b6b772008c87dab09207f9305945ae9dcd4d5..d7412c3938080a8072cef86886c2b902a8d5191d
mode 100644,100755..100755
--- 1/2019/program/grid-schedule.html
--- 2/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" -->