diff options
Diffstat (limited to 'lib/common/Utils.h')
| -rw-r--r-- | lib/common/Utils.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/common/Utils.h b/lib/common/Utils.h index 8a938981..3134245a 100644 --- a/lib/common/Utils.h +++ b/lib/common/Utils.h @@ -39,11 +39,8 @@ std::string FormatUsageBar(int64_t Blocks, int64_t Bytes, int64_t Max, std::string FormatUsageLineStart(const std::string& rName, bool MachineReadable); -<<<<<<< HEAD -======= std::string BoxGetTemporaryDirectoryName(); ->>>>>>> 0.12 #include "MemLeakFindOff.h" #endif // UTILS__H |