web

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

- missing semi colon
- missing lines

web

Conflicts:
	tomcat/webapps/Trawl/index.jsp

# Conflicts:
#	tomcat/webapps/Trawl/infoWindow.js

- Working Map, Heatmap

web

# Conflicts:
#	tomcat/webapps/Trawl/WEB-INF/web.xml
#	tomcat/webapps/Trawl/index.jsp
#	tomcat/webapps/Trawl/infoWindow.js
#	tomcat/webapps/Trawl/script.js

- Broken

- Attempt to connect infomap
- Connected heatmap

- Attempt to connect map function

web

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

- fixed spelling
- removed alert()

web

# Conflicts:
#	tomcat/webapps/Trawl/infoGenerator.js

- Cast variables to number