Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

2XB3FinalProject
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

34467f1f

Commit 34467f1f authored 6 years ago by Winnie

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/web' into web

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

parents bb6a070c 287d961e

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

tomcat/webapps/Trawl/WEB-INF/web.xml 20 additions, 0 deletions

tomcat/webapps/Trawl/WEB-INF/web.xml
tomcat/webapps/Trawl/index.jsp 100 additions, 98 deletions

tomcat/webapps/Trawl/index.jsp
tomcat/webapps/Trawl/infoWindow.js 8 additions, 0 deletions

tomcat/webapps/Trawl/infoWindow.js
tomcat/webapps/Trawl/script.js 284 additions, 1 deletion

tomcat/webapps/Trawl/script.js

with 412 additions and 99 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment