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

This commit is contained in:
Glen Turner
2015-07-09 16:29:46 -04:00
parent e11d05bbf2
commit ec8845ec64

View File

@@ -6,9 +6,6 @@
Link to included files. These are typically done by fetching from the web. 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 Because this needs to run without an internet conection, the files were saved
locally locally
-->
<!--
Changes to the index file to test merge and pull requests.
--> -->
<script type="text/javascript" src="include/js/eventemitter2.min.js"></script> <script type="text/javascript" src="include/js/eventemitter2.min.js"></script>