}
-void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList){
+void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map<wxString, wxString> *MemoryFSList, wxString backgroundColour){
// Load the local data.
wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(LocalData, htmClient, ClientSID,
- wxT(""), MemoryFSList);
+ wxT(""), MemoryFSList, backgroundColour);
// Load the server data.
LoadContactData(ServerData, htmServer, ServerSID,
- wxT(""), MemoryFSList);
+ wxT(""), MemoryFSList, backgroundColour);
}
\ No newline at end of file