still testing

arc12012 · Apr 13, 2017 · 3de6d7c · 3de6d7c
1 parent 630efae
commit 3de6d7c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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>