Fix merge conflicts

1 files changed, 6 insertions, 7 deletions

diff --git a/src/services/file_size_format/file_size_format.js b/src/services/file_size_format/file_size_format.js
index 7e6cd4d7..17deb09b 100644
--- a/src/services/file_size_format/file_size_format.js
+++ b/src/services/file_size_format/file_size_format.js
@@ -1,15 +1,14 @@
-const fileSizeFormat = (num) => {
-  var exponent
-  var unit
-  var units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
+const fileSizeFormat = (numArg) => {
+  const units = ['B', 'KiB', 'MiB', 'GiB', 'TiB']
+  let num = numArg
   if (num < 1) {
     return num + ' ' + units[0]
   }
 
-  exponent = Math.min(Math.floor(Math.log(num) / Math.log(1024)), units.length - 1)
+  const exponent = Math.min(Math.floor(Math.log(num) / Math.log(1024)), units.length - 1)
   num = (num / Math.pow(1024, exponent)).toFixed(2) * 1
-  unit = units[exponent]
-  return { num: num, unit: unit }
+  const unit = units[exponent]
+  return { num, unit }
 }
 const fileSizeFormatService = {
   fileSizeFormat