mirror of
https://github.com/wassname/generator-react-webpack.git
synced 2026-10-30 13:20:15 +08:00
Merge branch 'master' of https://github.com/newtriks/generator-react-webpack
Conflicts: package.json
This commit is contained in:
commit
c6e140300e
10 files changed
+53
-55
No files matched your search
@@ -5,9 +5,9 @@ var ReactTransitionGroup = React.addons.TransitionGroup;
|
||||
|
||||
// CSS
|
||||
require('normalize.css');
|
||||
require('../../styles/main.css');
|
||||
require('../styles/main.css');
|
||||
|
||||
var imageURL = require('../../images/yeoman.png');
|
||||
var imageURL = require('../images/yeoman.png');
|
||||
|
||||
var <%= scriptAppName %> = React.createClass({
|
||||
render: function() {
|
||||
|
||||
Reference in new issue
Block a user