X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmConflictResolution.h;h=09e90ea7f2483238f176d711af1ae62a94e9fc4f;hb=a1e5a0c50e4081cd8db37acd168c5f045d2c6e81;hp=a4c487781ebf11d4f6fc338041eb71a3f842c1de;hpb=a73019906500e3a0fc306a61e4b7975f79725866;p=xestiaab%2F.git

diff --git a/source/frmConflictResolution.h b/source/frmConflictResolution.h
index a4c4877..09e90ea 100644
--- a/source/frmConflictResolution.h
+++ b/source/frmConflictResolution.h
@@ -50,7 +50,7 @@ class frmConflictResolution : public frmConflictResolutionADT
 		/** Constructor */
 		frmConflictResolution( wxWindow* parent );
 		int GetResult();
-		void LoadData(vCard *LocalObj, vCard *ServerObj, std::map<wxString, wxString> *MemoryFSList);
+		void LoadData(vCard *LocalObj, vCard *ServerObj, std::map<wxString, wxString> *MemoryFSList, wxString backgroundColour);
 	//// end generated class members
 	
 };