Revert "Update header.html"

This reverts commit e6f2f8a.
mpa139 · Feb 22, 2022 · 0c04069 · 0c04069
1 parent e6f2f8a
commit 0c04069
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -8,11 +8,7 @@
 		<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">