From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Mon, 30 Nov 2015 13:09:02 +0000 (+0000)
Subject: Removed commented out lines from ConflictResolution in frmMain
X-Git-Tag: release-0.06~8
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=55ebcf590d3bf7f4bd27c7978ad86cec1ce6f92b

Removed commented out lines from ConflictResolution in frmMain
---

diff --git a/source/frmMain.cpp b/source/frmMain.cpp
index 1237b82..fcb9952 100644
--- a/source/frmMain.cpp
+++ b/source/frmMain.cpp
@@ -1586,11 +1586,7 @@ void frmMain::ConflictResolution(wxCommandEvent& event){
     vCardConflictObj *vCardConfObj = (vCardConflictObj*)event.GetClientData();
     vCard *ClientDataPtr = vCardConfObj->vCardLocalData;
     vCard *ServerDataPtr = vCardConfObj->vCardServerData;
-    //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
-    //wxString Moo = ClientDataPtr->WriteString();
-    //vCard *ServerDataPtr = vCardConfObj->vCardServerData;
     frameCR->LoadData(ClientDataPtr, ServerDataPtr, &MemoryFileList);
-    //frameCR->LoadData(vCardConfObj->vCardLocalData, vCardConfObj->vCardServerData, &MemoryFileList);
     frameCR->ShowModal();
     
     int FinalConflictResult = frameCR->GetResult();