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

Browse Source

...

This commit is contained in:

Alexey Martemyanov committed 2026-06-01 17:35:18 +06:00

2 parents 65eb5b8010 cc86298f50

commit 6e66925eb0

1 file changed

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

File mode changed.