diff --git a/src/components/ConflictNoteBanner.tsx b/src/components/ConflictNoteBanner.tsx index 397f45d5..41cf577c 100644 --- a/src/components/ConflictNoteBanner.tsx +++ b/src/components/ConflictNoteBanner.tsx @@ -21,7 +21,7 @@ export function ConflictNoteBanner({ onKeepMine, onKeepTheirs }: ConflictNoteBan flexShrink: 0, }} > - + This note has a merge conflict