Skip to content

Commit d742979

Browse files
authored
Update _post_filters.html.erb
1 parent e14570c commit d742979

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

app/views/shared/_post_filters.html.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@
3737
</ul>
3838
</li>
3939
</ul>
40-
<<<<<<< HEAD
41-
=======
40+
4241
<ul class="nav navbar-nav d-none d-sm-flex">
4342
<li class="dropdown nav-item">
4443
<a class="dropdown-toggle nav-link text-primary" href="#" data-bs-toggle="dropdown" role="button" aria-expanded="false">
@@ -71,6 +70,5 @@
7170
</ul>
7271
</li>
7372
</ul>
74-
>>>>>>> 66663daa (refactor code)
7573
</form>
7674
</div>

0 commit comments

Comments
 (0)