fix(conflict): fix merge conflict

2019-11-21 10:07:00 +08:00 · 2019-11-21 10:07:00 +08:00 · 0f2cb2160f
parent b644c2be01 e59b81a3a9
commit 0f2cb2160f
2 changed files with 2 additions and 0 deletions
--- a/.cache/redux.state
+++ b/.cache/redux.state
--- a/.travis.yml
+++ b/.travis.yml
@ -5,6 +5,8 @@ node_js:
 branches:
  only:
  - next
 install:
 - yarn install
 script:
 - yarn test
 - yarn coveralls