summaryrefslogtreecommitdiff
path: root/zen/format_unit.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <shieldwed@outlook.com>2019-12-14 15:52:53 +0000
committerDaniel Wilhelm <shieldwed@outlook.com>2019-12-14 15:52:53 +0000
commitcc75e50ca861529d50601d247fd66f806fcb23a8 (patch)
treee2c5c7b1f98e64011b1ee8ca4e9bb9157510dfe7 /zen/format_unit.cpp
parentMerge branch '10.17' into 'master' (diff)
parentadd upstream 10.18 (diff)
downloadFreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.gz
FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.tar.bz2
FreeFileSync-cc75e50ca861529d50601d247fd66f806fcb23a8.zip
Merge branch '10.18' into 'master'10.18
add upstream 10.18 See merge request opensource-tracking/FreeFileSync!15
Diffstat (limited to 'zen/format_unit.cpp')
-rw-r--r--zen/format_unit.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/zen/format_unit.cpp b/zen/format_unit.cpp
index 3e75278b..f2df4153 100644
--- a/zen/format_unit.cpp
+++ b/zen/format_unit.cpp
@@ -117,7 +117,7 @@ std::wstring roundToBlock(double timeInHigh,
if (unitLowPerHigh > blockSizeLow)
output += L" " + formatUnitTime(roundedtimeInLow % unitLowPerHigh, unitLow);
return output;
-};
+}
}
bgstack15