mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2025-06-27 17:18:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix conflict bug

Browse Source
This commit is contained in:
rockerBOO 2025-04-30 20:44:55 -04:00
parent 9e3a89cef3
commit 15a397daee
No known key found for this signature in database
GPG Key ID: 0D4EAF00DCABC97B
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/invidious/views/feeds/history.ecr
View File

@ -33,17 +33,6 @@
<img class="thumbnail" src="/vi/<%= item %>/mqdefault.jpg" alt="" />
</a>
<<<<<<< HEAD
<div class="top-left-overlay"><div class="watched">
<form data-onsubmit="return_false" action="/watch_ajax?action_mark_unwatched=1&id=<%= item %>&referer=<%= env.get("current_page") %>" method="post">
<input type="hidden" name="csrf_token" value="<%= URI.encode_www_form(env.get?("csrf_token").try &.as(String) || "") %>">
<button type="submit" class="pure-button pure-button-secondary low-profile"
data-onclick="mark_unwatched" data-id="<%= item %>"><i class="icon ion-md-trash"></i></button>
</form>
</div></div>
</div>
</div>
=======
<div class="top-left-overlay"><div class="watched">
<form data-onsubmit="return_false" action="/watch_ajax?action=mark_unwatched&id=<%= item %>&referer=<%= env.get("current_page") %>" method="post">
<input type="hidden" name="csrf_token" value="<%= URI.encode_www_form(env.get?("csrf_token").try &.as(String) || "") %>">
@ -52,10 +41,8 @@
</form>
</div></div>
</div>
<p></p>
</div>
</div>
>>>>>>> master
<% end %>
</div>