Header; Merge conflict resolved

IEEE-EMBS-Manipal · Dec 20, 2023 · cd53014 · cd53014
1 parent 9febd93
commit cd53014
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/templates/header.html b/templates/header.html
@@ -14,12 +14,8 @@ <h1 class="text-white">IEEE EMBS Manipal</h1>
             </a>
             <nav class="header-text nav nav-masthead justify-content-center float-md-end">
                 <a class="nav-link text-white" href="{{ url_for('pages', page='about') }}">About</a>
-<<<<<<< Updated upstream
                 <a class="nav-link text-white" href="{{ url_for('pages', page='domains') }}">Domains</a>
                 <a class="nav-link text-white" href="{{ url_for('pages', page='blog') }}">Blog</a>
-=======
-                <a class="nav-link text-white" href="{{ url_for('pages', page='blog') }}">Domains</a>
->>>>>>> Stashed changes
                 <a class="nav-link text-white" href="{{ url_for('pages', page='events') }}">Events</a>
                 <a class="nav-link text-white" href="{{ url_for('pages', page='team') }}">Team</a>
                 <a class="nav-link text-white" href="{{ url_for('pages', page='contact') }}">Contact us</a>