Mercurial > hg > dav / file diff

--- a/dav/sync.h	Thu Mar 17 15:06:26 2016 +0100
+++ b/dav/sync.h	Thu Mar 17 20:24:37 2016 +0100
@@ -56,7 +56,7 @@
         int *counter);
 int sync_remove_local_resource(SyncDirectory *dir, LocalResource *res);
 void sync_remove_local_directory(SyncDirectory *dir, LocalResource *res);
-void rename_local_file(SyncDirectory *dir, SyncDatabase *db, char *path);
+void rename_conflict_file(SyncDirectory *dir, SyncDatabase *db, char *path);
 char* create_tmp_download_path(char *path);
 void move_to_trash(SyncDirectory *dir, char *path);
 UcxList* local_scan(SyncDirectory *dir, SyncDatabase *db);