diff options
Diffstat (limited to 'lib/common/BoxTime.cpp')
| -rw-r--r-- | lib/common/BoxTime.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/common/BoxTime.cpp b/lib/common/BoxTime.cpp index ead3410b..f62b1c35 100644 --- a/lib/common/BoxTime.cpp +++ b/lib/common/BoxTime.cpp @@ -94,8 +94,6 @@ std::string FormatTime(box_time_t time, bool includeDate, bool showMicros) return buf.str(); } -<<<<<<< HEAD -======= // -------------------------------------------------------------------------- // // Function @@ -145,4 +143,3 @@ void ShortSleep(box_time_t duration, bool logDuration) #endif } ->>>>>>> 0.12 |