resolve conflict

reactjs · Oct 11, 2019 · 4567237 · 4567237
1 parent 0922a79
commit 4567237
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/site-constants.js b/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.10.0';
-=======
-const urlRoot = 'https://reactjs.org';
 const version = '16.10.2';
->>>>>>> 5c371e5e3fd8f92e1d06dfdf1f28edc50fb5d83f
 const babelURL = 'https://unpkg.com/[email protected]/babel.min.js';
 
 export {babelURL, urlRoot, version};