From 8cdd44f01c9356a1f35ad1ac2a794d86f119a318 Mon Sep 17 00:00:00 2001
From: Silberengel <silberengel7@protonmail.com>
Date: Mon, 20 Oct 2025 08:20:40 +0200
Subject: [PATCH] solve merge conflict

---
 src/components/NoteStats/LikeButton.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/NoteStats/LikeButton.tsx b/src/components/NoteStats/LikeButton.tsx
index fca061e..faf5d98 100644
--- a/src/components/NoteStats/LikeButton.tsx
+++ b/src/components/NoteStats/LikeButton.tsx
@@ -95,7 +95,6 @@ export default function LikeButton({ event }: { event: Event }) {
     <button
       className="flex items-center enabled:hover:text-primary gap-1 px-3 h-full text-muted-foreground"
       title={t('Like')}
-<<<<<<< HEAD
       disabled={liking || ((isDiscussion || isReplyToDiscussion) && hasVoted)}
       onClick={() => {
         if (isSmallScreen && !((isDiscussion || isReplyToDiscussion) && hasVoted)) {