mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 22:05:53 +03:00
Fixed merge conflict, only one md5 needed.
This commit is contained in:
parent
ede710843b
commit
9bd9949d68
1 changed files with 4 additions and 3 deletions
|
@ -94,16 +94,16 @@ struct csync_s {
|
|||
char *uri;
|
||||
c_rbtree_t *tree;
|
||||
c_list_t *list;
|
||||
c_list_t *id_list;
|
||||
enum csync_replica_e type;
|
||||
unsigned long changes;
|
||||
} local;
|
||||
|
||||
struct {
|
||||
char *uri;
|
||||
c_rbtree_t *tree;
|
||||
c_list_t *list;
|
||||
c_list_t *id_list;
|
||||
enum csync_replica_e type;
|
||||
unsigned long changes;
|
||||
} remote;
|
||||
|
||||
struct {
|
||||
|
@ -161,6 +161,7 @@ struct csync_file_stat_s {
|
|||
mode_t mode; /* u32 */
|
||||
int nlink; /* u32 */
|
||||
int type; /* u32 */
|
||||
|
||||
char *destpath; /* for renames */
|
||||
char *md5;
|
||||
enum csync_instructions_e instruction; /* u32 */
|
||||
|
|
Loading…
Reference in a new issue