Merge branch 'develop' into contextTypes

# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js

1 files changed, 3 insertions, 7 deletions

diff --git a/development/version-bump.js b/development/version-bump.js
index bedf87c01..fa20e9f75 100644
--- a/development/version-bump.js
+++ b/development/version-bump.js
@@ -1,6 +1,6 @@
 const clone = require('clone')
 
-async function versionBump(bumpType, changelog, oldManifest) {
+async function versionBump (bumpType, changelog, oldManifest) {
   const manifest = clone(oldManifest)
   const newVersion = newVersionFrom(manifest, bumpType)
 
@@ -19,13 +19,13 @@ async function versionBump(bumpType, changelog, oldManifest) {
   return {
     version: newVersion,
     manifest: manifest,
-    changelog: logLines.join('\n')
+    changelog: logLines.join('\n'),
   }
 }
 
 function newVersionFrom (manifest, bumpType) {
   const string = manifest.version
-  let segments = string.split('.').map((str) => parseInt(str))
+  const segments = string.split('.').map((str) => parseInt(str))
 
   switch (bumpType) {
     case 'major':
@@ -45,8 +45,4 @@ function newVersionFrom (manifest, bumpType) {
   return segments.map(String).join('.')
 }
 
-function bumpManifest (manifest, bumpType) {
-
-}
-
 module.exports = versionBump