lint & resolve upstream conflicts

electrode-io · Dec 12, 2016 · 78ddecd · 78ddecd
2 parents ad154cc + b34dd7f
commit 78ddecd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/packages/electrode-webpack-reporter/client/app.jsx b/packages/electrode-webpack-reporter/client/app.jsx
@@ -27,7 +27,6 @@ window.webappStart = () => {
   })).then((response) => {
     // for developing with electrode server <Router history={browserHistory}>{routes}</Router>
     return response.json().then((initialState) => {
-      console.log('webpack reporter initialized...')
       const store = createStore(rootReducer, initialState);
       const appContainer = document.querySelector(".js-content");
       unmountComponentAtNode(appContainer);

diff --git a/packages/electrode-webpack-reporter/client/components/legacy.jsx b/packages/electrode-webpack-reporter/client/components/legacy.jsx
@@ -5,7 +5,7 @@ const style = {
 };
 
 const Legacy = (props) => (
-  <pre style={style} dangerouslySetInnerHTML={ {__html: props.legacy} } />
+  <pre style={style} dangerouslySetInnerHTML={{__html: props.legacy}} />
 );
 
 Legacy.propTypes = {

diff --git a/packages/electrode-webpack-reporter/package.json b/packages/electrode-webpack-reporter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "electrode-webpack-reporter",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "A HTML based reporter for webpack dev server",
   "main": "lib/webpack-reporter.js",
   "scripts": {