mirror of
https://github.com/ICDSystems/ICD.Common.Utils.git
synced 2026-02-16 05:05:05 +00:00
fix: Fixing bad merge
This commit is contained in:
@@ -28,16 +28,6 @@ namespace ICD.Common.Utils.Json
|
|||||||
return DateTime.Parse(data);
|
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>
|
/// <summary>
|
||||||
/// Gets the token as a DateTime value.
|
/// Gets the token as a DateTime value.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user