Merge branch 'main' of github.com:Neeraj395-N3rd/K-Map_Solver

neeraj-395 · Sep 19, 2023 · 8a006ac · 8a006ac
2 parents f4739f2 + a7a27a9
commit 8a006ac
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/Web_Source/main.html b/Web_Source/main.html
@@ -20,7 +20,11 @@
             <img class="headerimg" style="float: right;" src="https://dseu.ac.in/wp-content/uploads/2021/05/Dseu-Logo-500X407-1.png" alt="Dseu logo">
         </a>
         <a href="https://dseu.ac.in/rajokri/" target="_blank" style="text-decoration: none;">
+<<<<<<< HEAD
             <div class="headertxt"><b><span style="color:#0072BC">RAJOKRI&nbsp;INSTITUTE</span><span style="color:#F7941D"><br>OF&nbsp;TECHNOLOGY</span></b></div>
+=======
+            <div class="headertxt"><b><span style="color: blue;">RAJOKRI&nbsp;INSTITUTE</span><span style="color: orange;"><br>OF&nbsp;TECHNOLOGY</span></b></div>
+>>>>>>> a7a27a9236e60f17d0c46e229e9f0b2062fac78a
         </a>
     </div>