Fixed merge conflict.

This commit is contained in:
Klaas Freitag 2012-08-23 17:34:02 +03:00
parent 2a40106e70
commit 943e960bc0

View file

@ -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 */
}