X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmConflictResolution.cpp;h=d5c0a3f3846a33a3f40d0dc07101f7475310d5d5;hb=0690fc58f73ac6938d29f6df9d66ce96c43516ce;hp=33a99fe3b42909c504a8a2c03d3e17200508a894;hpb=a73019906500e3a0fc306a61e4b7975f79725866;p=xestiaab%2F.git

diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index 33a99fe..d5c0a3f 100644
--- a/source/frmConflictResolution.cpp
+++ b/source/frmConflictResolution.cpp
@@ -28,6 +28,9 @@ frmConflictResolutionADT( parent )
 
 void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
 {
+	
+	// Button 'Keep Local' was pressed.
+	
 	ConflictResult = 1;
 	this->Close();
 
@@ -35,6 +38,9 @@ void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
 
 void frmConflictResolution::KeepServerData( wxCommandEvent& event )
 {
+	
+	// Button 'Keep Server' was pressed.
+	
 	ConflictResult = 2;
 	this->Close();
 
@@ -43,6 +49,8 @@ void frmConflictResolution::KeepServerData( wxCommandEvent& event )
 void frmConflictResolution::DecideLater( wxCommandEvent& event )
 {
 
+	// Button 'Decide Later' was pressed.
+	
 	ConflictResult = 0;
 	this->Close();
 
@@ -50,6 +58,8 @@ void frmConflictResolution::DecideLater( wxCommandEvent& event )
 
 int frmConflictResolution::GetResult(){
 
+	// Get the result of the dialog.
+	
 	return ConflictResult;
 
 }