fix merge conflic

Author: LawEKS

.eslintrc.json

@@ -0,0 +1,4 @@
+{
+  "parser": "babel-eslint",
+  "extends": ["eslint:recommended", "plugin:react/recommended"]
+}

.gitignore

@@ -1,3 +1,4 @@
 node_modules/
 .cache/
 dist/
+.vscode/

.travis.yml

@@ -0,0 +1,17 @@
+language: node_js
+node_js:
+  - "stable"
+cache:
+  directories:
+  - node_modules
+script:
+  - npm test
+  - npm run build
+deploy:
+  provider: pages
+  skip_cleanup: true
+  github_token: $github_token
+  local_dir: dist
+  keep-history: true
+  on:
+    branch: master

index.js

@@ -2,6 +2,6 @@ import React from 'react';
 import { render } from 'react-dom';
 import App from './components/app/app'; 
 
-
+// eslint-disable-next-line
 render(<App />, document.getElementById('root'));