diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
| commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
| tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /development | |
| parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
| parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
| download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.bz2 tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.lz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.xz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip | |
fix merge conflicts
Diffstat (limited to 'development')
| -rw-r--r-- | development/states/conf-tx.json | 2 | ||||
| -rw-r--r-- | development/states/first-time.json | 2 | ||||
| -rw-r--r-- | development/states/notice.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/development/states/conf-tx.json b/development/states/conf-tx.json index 0f1a13751..57f667cb9 100644 --- a/development/states/conf-tx.json +++ b/development/states/conf-tx.json @@ -52,7 +52,7 @@ "conversionRate": 12.7200827, "conversionDate": 1487363041, "noActiveNotices": true, - "lastUnreadNotice": { + "nextUnreadNotice": { "read": true, "date": "Thu Feb 09 2017", "title": "Terms of Use", diff --git a/development/states/first-time.json b/development/states/first-time.json index fe9188b80..f10eefd35 100644 --- a/development/states/first-time.json +++ b/development/states/first-time.json @@ -12,7 +12,7 @@ "conversionRate": 12.7527416, "conversionDate": 1487624341, "noActiveNotices": false, - "lastUnreadNotice": { + "nextUnreadNotice": { "read": false, "date": "Thu Feb 09 2017", "title": "Terms of Use", diff --git a/development/states/notice.json b/development/states/notice.json index efeffab08..4401393c3 100644 --- a/development/states/notice.json +++ b/development/states/notice.json @@ -13,7 +13,7 @@ "conversionRate": 8.3533002, "conversionDate": 1481671082, "noActiveNotices": false, - "lastUnreadNotice": { + "nextUnreadNotice": { "read": false, "date": "Tue Dec 13 2016", "title": "MultiVault Support", |