Update header.html

mpa139 · Feb 22, 2022 · ab37ebc · ab37ebc
1 parent 0c04069
commit ab37ebc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -8,7 +8,11 @@
 		<span class="icon-bar"></span>
 	  </button>
 <p style="padding: 0px 0px 0px 0px;">
+<<<<<<< HEAD
 		<a class="navbar-brand" style="padding-top: 25px; font-family: 'Cabin', Arial, Helvetica, sans-serif; font-size: 260%; white-space: nowrap; color: #FFFFFF" href="{{ site.url }}{{ site.baseurl }}/"><b>Roychoudhuri</b> Lab</a>
+=======
+		<a class="navbar-brand" style="padding-top: 25px; font-family: Arial, Helvetica, sans-serif; font-size: 260%; white-space: nowrap; color: #FFFFFF" href="{{ site.url }}{{ site.baseurl }}/"><b>Roychoudhuri</b> Lab</a>
+>>>>>>> parent of 78da68d (Update header.html)
 			</p>
 </div>
 <div class="collapse navbar-collapse" id="navbar-collapse-1" style="padding-bottom: 25px">