fix: remove git commit head line

2026-07-15 21:03:47 +00:00 · 2026-05-13 01:36:35 -05:00
parent ec87f8a4d1
commit 84a8dfa050
1 changed files with 0 additions and 1 deletions
@@ -535,7 +535,6 @@ export function FileManagerContextMenu({
      <div
        ref={menuRef}
        data-context-menu
-<<<<<<< HEAD:src/ui/desktop/apps/features/file-manager/FileManagerContextMenu.tsx
        className={cn(
          "fixed bg-canvas border border-edge rounded-lg shadow-xl min-w-[180px] max-w-[250px] z-[99995] overflow-x-hidden overflow-y-auto",
        )}