diff -r 2e3a24b9896a -r 8b88efcbf56f docs/html/delete-conflicts.html --- a/docs/html/delete-conflicts.html Sun Dec 15 16:54:05 2019 +0100 +++ b/docs/html/delete-conflicts.html Sun Dec 15 17:00:46 2019 +0100 @@ -1,12 +1,20 @@ - - + + - - + + dav-sync delete-conflicts - - + + +
@@ -26,6 +34,7 @@
  • remove
  • copy
  • move
    • +
  • rename
  • export
  • import
  • get-property
    • @@ -35,9 +44,19 @@
  • unlock
  • info
  • date
    • +
  • versioncontrol
    • +
  • list-versions
    • +
  • checkout
    • +
  • checkin
    • +
  • uncheckout
  • add-repository
  • remove-repository
  • list-repositories
    • +
  • repository-url
    • +
  • add-user
    • +
  • remove-user
    • +
  • edit-user
    • +
  • list-users
  • check-config
  • Configuration
    • @@ -53,11 +72,13 @@
  • pull
  • push
  • archive
    • -
  • list-conflicts
    • +
  • restore
    • +
  • list-conflicts
  • resolve-conflicts
  • delete-conflicts
  • trash-info
  • empty-trash
    • +
  • list-versions
  • add-tag
  • remove-tag
  • set-tags
    • @@ -74,9 +95,9 @@
    - +

    dav-sync delete-conflicts <directory>

    Deletes all files that are marked as a conflict. This will always delete the files and does not move them to the trash directory.