diff options
Diffstat (limited to 'lib/common/FileModificationTime.h')
| -rw-r--r-- | lib/common/FileModificationTime.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/common/FileModificationTime.h b/lib/common/FileModificationTime.h index ffff29c7..85424842 100644 --- a/lib/common/FileModificationTime.h +++ b/lib/common/FileModificationTime.h @@ -14,15 +14,9 @@ #include "BoxTime.h" -<<<<<<< HEAD -box_time_t FileModificationTime(EMU_STRUCT_STAT &st); -box_time_t FileAttrModificationTime(EMU_STRUCT_STAT &st); -box_time_t FileModificationTimeMaxModAndAttr(EMU_STRUCT_STAT &st); -======= box_time_t FileModificationTime(const EMU_STRUCT_STAT &st); box_time_t FileAttrModificationTime(const EMU_STRUCT_STAT &st); box_time_t FileModificationTimeMaxModAndAttr(const EMU_STRUCT_STAT &st); ->>>>>>> 0.12 #endif // FILEMODIFICATIONTIME__H |