From 3de6d7c215b6a5f21580f25b9b55e9ec5f65065c Mon Sep 17 00:00:00 2001
From: Adam R Claxton <adam.claxton@uconn.edu>
Date: Wed, 12 Apr 2017 22:25:54 -0400
Subject: [PATCH] still testing

---
 WebContent/html/webpages/navbar.jspf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/WebContent/html/webpages/navbar.jspf b/WebContent/html/webpages/navbar.jspf
index 5ba396c..ba0c9e4 100644
--- a/WebContent/html/webpages/navbar.jspf
+++ b/WebContent/html/webpages/navbar.jspf
@@ -3,11 +3,7 @@
 <div class="container-fluid">
 	<div class="navbar-header">
 		<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-<<<<<<< HEAD
-			<span class="sr-only">Another thing</span>
-=======
 			<span class="sr-only">One thing</span>
->>>>>>> master
 			<span class="icon-bar"></span>
 			<span class="icon-bar"></span>
 			<span class="icon-bar"></span>