Skip to content

Commit 872dba6

Browse files
author
Sven
committed
resolve conflict in readme
2 parents 275501b + 31bf40c commit 872dba6

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
Get start with [React](https://facebook.github.io/react/), [Redux](http://redux.js.org/), [RR4](https://github.com/ReactTraining/react-router/tree/master/packages/react-router-dom), [Webpack3](https://webpack.js.org/) 🚀
88

9+
910
>2017/8/29
1011
checkout branch mobx to see the version mobx instead of redux!
1112

@@ -38,7 +39,7 @@ checkout branch mobx to see the version mobx instead of redux!
3839
- ES6 + Babel
3940
- Webpack3
4041
- Redux
41-
- React-Router v4
42+
- React-Router-Dom
4243
- Reactstrap + Bootstrap\^4.0.0-alpha.6 (UI)
4344
- Sass
4445
- Eslint

0 commit comments

Comments
 (0)