conflict resolve

Author: Uco

package.json

@@ -46,13 +46,8 @@
     "normalize.css": "^8.0.0",
     "prettier": "^1.7.4",
     "prismjs": "^1.15.0",
-<<<<<<< HEAD
-    "react": "16.7.0-alpha.0",
-    "react-dom": "16.7.0-alpha.0",
-=======
     "react": "16.8.2",
     "react-dom": "16.8.2",
->>>>>>> parent of 2723c383... Merge branch 'master' into master
     "react-helmet": "^5.2.0",
     "react-live": "1.8.0-0",
     "remarkable": "^1.7.1",

src/site-constants.js

@@ -8,11 +8,7 @@
 // NOTE: We can't just use `location.toString()` because when we are rendering
 // the SSR part in node.js we won't have a proper location.
 const urlRoot = 'https://reactjs.org';
-<<<<<<< HEAD
-const version = '16.8.1';
-=======
 const version = '16.8.2';
->>>>>>> parent of 2723c383... Merge branch 'master' into master
 const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
 
 export {urlRoot, version, babelURL};