From 15a397daee743992516fb541603bed1e26578279 Mon Sep 17 00:00:00 2001
From: rockerBOO <rockerboo@gmail.com>
Date: Wed, 30 Apr 2025 20:44:55 -0400
Subject: [PATCH] Fix conflict bug

---
 src/invidious/views/feeds/history.ecr | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/invidious/views/feeds/history.ecr b/src/invidious/views/feeds/history.ecr
index e0c474b2..8552554d 100644
--- a/src/invidious/views/feeds/history.ecr
+++ b/src/invidious/views/feeds/history.ecr
@@ -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>