From d9b3e1a46b33b70693286293f43dd1fc2ede4449 Mon Sep 17 00:00:00 2001
From: mumamomumo <uptotheprodab@gmail.com>
Date: Sun, 26 Jan 2025 22:19:53 +0800
Subject: [PATCH] Sync on mac 	modified:   src/components/ui/Titlebar.tsx

---
 src/components/ui/Titlebar.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/ui/Titlebar.tsx b/src/components/ui/Titlebar.tsx
index 457c44f..1cd1c16 100644
--- a/src/components/ui/Titlebar.tsx
+++ b/src/components/ui/Titlebar.tsx
@@ -48,14 +48,10 @@ function Titlebar() {
             />
           </div>
         )}
-<<<<<<< HEAD
         <div
           className="titlebar-buttons flex h-[100%] flex-1 justify-end"
           data-tauri-drag-region
         >
-=======
-        <div className="titlebar-buttons flex h-[100%] flex-1 justify-end">
->>>>>>> refs/remotes/origin/main
           <button
             className="titlebar-button minimize exclude"
             onClick={handleMinimize}