Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
2XB3FinalProject
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Christopher Schankula
2XB3FinalProject
Commits
8b77db69
Commit
8b77db69
authored
7 years ago
by
Christopher Schankula
Browse files
Options
Downloads
Plain Diff
Merge branch 'web' of git@gitlab.cas.mcmaster.ca:schankuc/2XB3.git into
web Conflicts: tomcat/webapps/Trawl/index.jsp
parents
f6724c01
34467f1f
No related branches found
No related tags found
Loading
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
tomcat/webapps/Trawl/index.jsp
+0
-5
0 additions, 5 deletions
tomcat/webapps/Trawl/index.jsp
tomcat/webapps/Trawl/infoWindow.js
+32
-39
32 additions, 39 deletions
tomcat/webapps/Trawl/infoWindow.js
tomcat/webapps/Trawl/script.js
+2
-4
2 additions, 4 deletions
tomcat/webapps/Trawl/script.js
with
34 additions
and
48 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
