From 55ebcf590d3bf7f4bd27c7978ad86cec1ce6f92b Mon Sep 17 00:00:00 2001 From: Steve Brokenshire Date: Mon, 30 Nov 2015 13:09:02 +0000 Subject: [PATCH] Removed commented out lines from ConflictResolution in frmMain --- source/frmMain.cpp | 4 ---- 1 file changed, 4 deletions(-) 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(); -- 2.39.5