Mercurial > hg > dav / file diff

--- a/dav/db.h	Thu Mar 17 15:06:26 2016 +0100
+++ b/dav/db.h	Thu Mar 17 20:24:37 2016 +0100
@@ -53,14 +53,15 @@
 
 struct SyncDatabase {
     UcxMap *resources;
-    UcxMap *remove;
+    //UcxMap *remove;
+    UcxMap *conflict;
 };
 
 SyncDatabase* load_db(char *name);
 int store_db(SyncDatabase *db, char *name);
 
 LocalResource* process_resource(xmlTextReaderPtr reader);
-LocalResource* process_remove(xmlTextReaderPtr reader);
+LocalResource* process_conflict(xmlTextReaderPtr reader);
 
 
 #ifdef	__cplusplus