[FE] fix: fix merge conflict in Sync Button(#144)

jungle-6-3 · Nov 13, 2024 · 9b63169 · 9b63169
2 parents 057a464 + 1c9164b
commit 9b63169
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/components/Conversation/SyncButton.tsx b/src/components/Conversation/SyncButton.tsx
@@ -40,12 +40,7 @@ export const SyncButton = () => {
         "fourth-step rounded-none border-b-2 border-blue-700 text-sm text-slate-800",
         otherUserSelectedCommitFile &&
           selectedCommitFile.filename !== otherUserSelectedCommitFile &&
-<<<<<<< HEAD
           "animate-pulse bg-blue-500 text-white duration-500",
-=======
-          "bg-blue-500 text-white",
-        isOpen && "bg-blue-500 text-white",
->>>>>>> 489bed770948ce94c0c34dba9427789ade586645
       )}
       onClick={navigateToOtherUserFile}
       size="sm"