[2026-06-01] sync: merge conflicts present — manual review needed

Browse Source

...

This commit is contained in:

Alexey Martemyanov

2026-06-01 14:00:40 +06:00

parent 8339d2c652 906698c32b

commit d17a47aa60

1 changed files with 0 additions and 0 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

.stfolder/syncthing-folder-940f59.txt

Regular → Executable