.

Author: gmartincor

app/views/shared/_post_filters.html.erb

@@ -37,6 +37,8 @@
         </ul>
       </li>
     </ul>
+<<<<<<< HEAD
+=======
     <ul class="nav navbar-nav d-none d-sm-flex">
       <li class="dropdown nav-item">
         <a class="dropdown-toggle nav-link text-primary" href="#" data-bs-toggle="dropdown" role="button" aria-expanded="false">
@@ -69,5 +71,6 @@
         </ul>
       </li>
     </ul>
+>>>>>>> 66663daa (refactor code)
   </form>
 </div>