From 287d961e9a36ae7beca336b979b2c6d18ee7d5e1 Mon Sep 17 00:00:00 2001
From: Ray Liu <rayliu109@gmail.com>
Date: Mon, 2 Apr 2018 23:21:12 -0400
Subject: [PATCH] Fixed merge conflicts

---
 tomcat/webapps/Trawl/index.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tomcat/webapps/Trawl/index.jsp b/tomcat/webapps/Trawl/index.jsp
index 098cd5e..5f099c4 100644
--- a/tomcat/webapps/Trawl/index.jsp
+++ b/tomcat/webapps/Trawl/index.jsp
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 <%@ page import="java.util.*" %>
 <!--
 Double Handle Slider Modified from: http://jqueryui.com/slider/#range
-- 
GitLab