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