Move INSTALL, LICENSE, README, THANKS and TODO into root directory

[xestiaab/.git] / source / frmConflictResolution.h

diff --git a/source/frmConflictResolution.h b/source/frmConflictResolution.h
index a4c4877..09e90ea 100644 (file)
--- 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
        
 };