update package devDependencies with merge conflicts manually

graphql · Dec 5, 2016 · 35d8d38 · 35d8d38
1 parent f5461c5
commit 35d8d38
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "babel-cli": "6.18.0",
     "babel-eslint": "7.1.1",
     "babel-plugin-syntax-async-functions": "6.13.0",
-    "babel-plugin-transform-class-properties": "6.18.0",
+    "babel-plugin-transform-class-properties": "6.19.0",
     "babel-plugin-transform-object-rest-spread": "6.19.0",
     "babel-preset-es2015": "6.18.0",
     "babel-preset-react": "6.16.0",
@@ -65,16 +65,16 @@
     "chai": "3.5.0",
     "chai-subset": "1.3.0",
     "eslint": "3.11.0",
-    "eslint-plugin-babel": "3.3.0",
+    "eslint-plugin-babel": "4.0.0",
     "eslint-plugin-react": "6.8.0",
     "express": "4.14.0",
     "express-graphql": "0.6.1",
     "flow-bin": "0.36.0",
     "graphql": "0.8.2",
     "jsdom": "9.8.3",
     "mocha": "3.2.0",
-    "react": "15.3.2",
-    "react-addons-test-utils": "15.3.2",
+    "react": "15.4.1",
+    "react-addons-test-utils": "15.4.0",
     "react-dom": "15.3.2",
     "uglify-js": "2.7.5",
     "uglifyify": "3.0.4",

diff --git a/src/components/ExecuteButton.js b/src/components/ExecuteButton.js
@@ -71,7 +71,7 @@ export class ExecuteButton extends React.Component {
 
     const pathJSX = this.props.isRunning ?
       <path d="M 10 10 L 23 10 L 23 23 L 10 23 z" /> :
-      <path d="M 11 9 L 24 16 L 11 23 z" />;
+        <path d="M 11 9 L 24 16 L 11 23 z" />;
 
     return (
       <div className="execute-button-wrap">