Skip to content
Snippets Groups Projects
Commit 287d961e authored by Ray Liu's avatar Ray Liu
Browse files

Fixed merge conflicts

parent 95ba8acb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tomcat/webapps/Trawl/index.jsp
+ 1
− 1
View file @ 287d961e
<<<<<<< HEAD
<%@ page import="java.util.*" %>
<!--
Double Handle Slider Modified from: http://jqueryui.com/slider/#range
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment