comparison: dav/db.h
dav/db.h
- changeset 560
- a816e805e5db
- parent 552
- e1a12762bf0a
- child 572
- 1eac93fcef77
equal
deleted
inserted
replaced
| 559:ba54fc8abdf1 | 560:a816e805e5db |
|---|---|
| 81 DavBool keep; | 81 DavBool keep; |
| 82 DavBool restore; | 82 DavBool restore; |
| 83 | 83 |
| 84 DavBool isnew; | 84 DavBool isnew; |
| 85 LocalResource *origin; | 85 LocalResource *origin; |
| 86 char *conflict_source; | |
| 86 }; | 87 }; |
| 87 | 88 |
| 88 struct FilePart { | 89 struct FilePart { |
| 89 uint64_t block; | 90 uint64_t block; |
| 90 char *hash; | 91 char *hash; |
