X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmConflictResolution.h;h=09e90ea7f2483238f176d711af1ae62a94e9fc4f;hp=3a48d94d16c1923481247c034217f90533f6463a;hb=f69e09d827e06435ea94bb73aa71ab5f9d5c035b;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc

diff --git a/source/frmConflictResolution.h b/source/frmConflictResolution.h
index 3a48d94..09e90ea 100644
--- a/source/frmConflictResolution.h
+++ b/source/frmConflictResolution.h
@@ -1,3 +1,21 @@
+// frmConflictResolution.h - Conflict Resolution header file.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+
 #ifndef __frmConflictResolution__
 #define __frmConflictResolution__
 
@@ -32,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
 	
 };