resolve conflict

Author: gergely-nagy

src/site-constants.js

@@ -7,13 +7,8 @@
 
 // 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.
-<<<<<<< HEAD
 const urlRoot = 'https://hu.reactjs.org';
-const version = '16.9.0';
-=======
-const urlRoot = 'https://reactjs.org';
 const version = '16.10.0';
->>>>>>> 647b639259919f96e9b667bf41ec16621e1b84dc
 const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
 
 export {babelURL, urlRoot, version};