Sync on mac

modified: src/components/ui/Titlebar.tsx
mumamomumo · Jan 26, 2025 · d9b3e1a · d9b3e1a
1 parent 30a259f
commit d9b3e1a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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}