X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmConflictResolution.cpp;h=33a99fe3b42909c504a8a2c03d3e17200508a894;hb=a45c3a46e4e37da415a8b8da2aaabe6a4abc4551;hp=16e0d554761b21bf7dc9c8b414fc9e2dee2786f3;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git

diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index 16e0d55..33a99fe 100644
--- a/source/frmConflictResolution.cpp
+++ b/source/frmConflictResolution.cpp
@@ -1,3 +1,21 @@
+// frmConflictResolution.cpp - Conflict Resolution form.
+//
+// (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/>
+
 #include "frmConflictResolution.h"
 #include "common/getcontactinfo.h"