Merge remote-tracking branch 'origin/ConnectPro_v1.1' into ConnectPro_v1.3

# Conflicts:
#	CHANGELOG.md
#	ICD.Common.Utils/Properties/AssemblyInfo.cs
This commit is contained in:
Chris Cameron
2019-06-24 12:52:24 -04:00
2 changed files with 10 additions and 2 deletions

View File

@@ -9,8 +9,12 @@ namespace ICD.Common.Utils.Xml
{
public sealed class IcdXmlException : Exception
{
private int m_LineNumber;
private int m_LinePosition;
private readonly int m_LineNumber;
private readonly int m_LinePosition;
public int LineNumber { get { return m_LineNumber; } }
public int LinePosition { get { return m_LinePosition; } }
/// <summary>
/// Constructor.