Conflicts:
	package.json
This commit is contained in:
Yonatan Schreiber committed 2015-04-19 15:11:19 +03:00
commit c6e140300e
10 files changed
+53 -55

No files matched your search

+2 -2
View File
@@ -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() {