From 456723752b69176c4ad38f9a60bbc8496189bfdd Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Fri, 11 Oct 2019 14:35:00 +0200 Subject: [PATCH] resolve conflict --- src/site-constants.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/site-constants.js b/src/site-constants.js index 2dde6d12e..bd2428aa9 100644 --- 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/babel-standalone@6.26.0/babel.min.js'; export {babelURL, urlRoot, version};