fix: Fixing bad merge

This commit is contained in:
Chris Cameron
2019-04-08 10:59:37 -04:00
parent 3041d0f402
commit 30ea6ced9e

View File

@@ -28,16 +28,6 @@ namespace ICD.Common.Utils.Json
return DateTime.Parse(data);
}
/// <summary>
/// Gets the data as a DateTime value.
/// </summary>
/// <param name="data"></param>
/// <returns></returns>
public static DateTime ParseDateTime(string data)
{
return DateTime.Parse(data);
}
/// <summary>
/// Gets the token as a DateTime value.
/// </summary>