docs/src/resolve-conflicts.md@ddb5e8f2a43d
docs/src/resolve-conflicts.md
Sat, 05 Aug 2017 11:33:17 +0200
- author
- Mike Becker <universe@uap-core.de>
- date
- Sat, 05 Aug 2017 11:33:17 +0200
- changeset 281
- ddb5e8f2a43d
- parent 274
- 5577d3eae04c
- child 282
- 3070d72f54af
- permissions
- -rw-r--r--
some more minor doc improvements
dav-sync resolve-conflicts ========================== **`resolve-conflicts <directory>`** Removes conflict entries from the database. This does not merge any files. All files which are marked as conflict are normal files after running this command.
