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/?a=commitdiff_plain;h=55ebcf590d3bf7f4bd27c7978ad86cec1ce6f92b;hp=55ebcf590d3bf7f4bd27c7978ad86cec1ce6f92b;p=xestiaab%2F.git

Removed commented out lines from ConflictResolution in frmMain
---