aboutsummaryrefslogtreecommitdiffstats
path: root/development/version-bump.js
diff options
context:
space:
mode:
authorbrunobar79 <brunobar79@gmail.com>2018-11-21 06:44:28 +0800
committerbrunobar79 <brunobar79@gmail.com>2018-11-21 06:44:28 +0800
commit9b1df386de908ae14e0ce169f1231a0d6de77972 (patch)
treed7fc663343b7ba3c28dff0022ca018a01bea451c /development/version-bump.js
parentc0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff)
parent5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff)
downloadtangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.bz2
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.lz
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.xz
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst
tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip
fix merge conflicts
Diffstat (limited to 'development/version-bump.js')
-rw-r--r--development/version-bump.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/development/version-bump.js b/development/version-bump.js
index fa20e9f75..66b6baffe 100644
--- a/development/version-bump.js
+++ b/development/version-bump.js
@@ -10,7 +10,7 @@ async function versionBump (bumpType, changelog, oldManifest) {
const logHeader = `\n## ${newVersion} ${date}`
const logLines = changelog.split('\n')
for (let i = 0; i < logLines.length; i++) {
- if (logLines[i].includes('Current Master')) {
+ if (logLines[i].includes('Current Develop Branch')) {
logLines.splice(i + 1, 0, logHeader)
break
}