From ec8845ec6490af517e071f7322d1d38c475f5cd6 Mon Sep 17 00:00:00 2001
From: Glen Turner <8gt6@queensu.ca>
Date: Thu, 9 Jul 2015 16:29:46 -0400
Subject: [PATCH] testing merging from 'pelican' branch to 'master' branch.
 Removed some commentary in the Pelican branch that I want to be changed in
 the master branch

---
 index.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/index.html b/index.html
index f37c294..8f186bd 100644
--- a/index.html
+++ b/index.html
@@ -6,9 +6,6 @@
 Link to included files. These are typically done by fetching from the web.
 Because this needs to run without an internet conection, the files were saved
 locally
--->
-<!-- 
-Changes to the index file to test merge and pull requests.
 -->
         <script type="text/javascript" src="include/js/eventemitter2.min.js"></script>