diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-09 02:30:49 +0800 |
commit | 286bde606f1c42a8edf2793b78042f5ef3271894 (patch) | |
tree | c8beb87f4726385fa766bb5ccea185055a244acb /app/scripts/migrations/index.js | |
parent | 0ebdd73e027f62bb5d83f96fcbca85f4e9c9038c (diff) | |
download | tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.gz tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.tar.zst tangerine-wallet-browser-286bde606f1c42a8edf2793b78042f5ef3271894.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts/migrations/index.js')
-rw-r--r-- | app/scripts/migrations/index.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js index bd0005221..3b512715e 100644 --- a/app/scripts/migrations/index.js +++ b/app/scripts/migrations/index.js @@ -38,4 +38,5 @@ module.exports = [ require('./025'), require('./026'), require('./027'), + require('./028'), ] |