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

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
 	
 };