Merge branch 'master' into email

arc12012 · Apr 13, 2017 · 630efae · 630efae
2 parents f9919e9 + 21cf687
commit 630efae
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/WebContent/html/webpages/navbar.jspf b/WebContent/html/webpages/navbar.jspf
@@ -3,7 +3,11 @@
 <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>