comparison: dav/sync.h
dav/sync.h
- changeset 563
- 3dffe58a573f
- parent 558
- 1a9e6a5c1e79
- child 567
- b0ce8b27978b
equal
deleted
inserted
replaced
| 562:78a25071ed88 | 563:3dffe58a573f |
|---|---|
| 172 | 172 |
| 173 void update_parts(LocalResource *local, UcxList *updates, uint64_t numparts); | 173 void update_parts(LocalResource *local, UcxList *updates, uint64_t numparts); |
| 174 | 174 |
| 175 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); | 175 void remove_deleted_conflicts(SyncDirectory *dir, SyncDatabase *db); |
| 176 | 176 |
| 177 int cmd_list_conflicts(CmdArgs *args); | |
| 177 int cmd_resolve_conflicts(CmdArgs *args); | 178 int cmd_resolve_conflicts(CmdArgs *args); |
| 178 int cmd_delete_conflicts(CmdArgs *args); | 179 int cmd_delete_conflicts(CmdArgs *args); |
| 179 | 180 |
| 180 int cmd_list_versions(CmdArgs *args); | 181 int cmd_list_versions(CmdArgs *args); |
| 181 | 182 |
