diff options
Diffstat (limited to 'lib/common/Utils.h')
| -rw-r--r-- | lib/common/Utils.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/common/Utils.h b/lib/common/Utils.h index 8d98a520..8a938981 100644 --- a/lib/common/Utils.h +++ b/lib/common/Utils.h @@ -39,6 +39,11 @@ 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 |