X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmConflictResolution.cpp;h=17791619b90e0d3839524d699a5cf9cc636f9e69;hp=d5c0a3f3846a33a3f40d0dc07101f7475310d5d5;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hpb=c139f797277a0cd85fe9f0b6b8244b791e0cf9ab

diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index d5c0a3f..1779161 100644
--- a/source/frmConflictResolution.cpp
+++ b/source/frmConflictResolution.cpp
@@ -64,7 +64,7 @@ int frmConflictResolution::GetResult(){
 
 }
 
-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.
 
@@ -72,11 +72,11 @@ void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::m
 	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