Add conflict resolution diff UI and app branding

Browse Source

...

This commit is contained in:

Tim Bendt

2026-05-13 16:25:28 -04:00

parent 780ff3a02c

commit d359baa010

83 changed files with 4523 additions and 3735 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

apps/server/internal/httpserver/static/cairnquire logo@2x.webp Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 415 KiB