mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-27 09:30:13 +03:00
Fixed merge conflict.
This commit is contained in:
parent
2a40106e70
commit
943e960bc0
1 changed files with 1 additions and 0 deletions
|
@ -160,6 +160,7 @@ struct csync_file_stat_s {
|
|||
int nlink; /* u32 */
|
||||
int type; /* u32 */
|
||||
char *destpath; /* for renames */
|
||||
char *md5;
|
||||
enum csync_instructions_e instruction; /* u32 */
|
||||
char path[1]; /* u8 */
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue