Skip to content

Commit e474987

Browse files
committed
Resolve merge conflicts
1 parent ad6a111 commit e474987

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

src/site-constants.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77

88
// NOTE: We can't just use `location.toString()` because when we are rendering
99
// the SSR part in node.js we won't have a proper location.
10-
<<<<<<< HEAD
1110
const urlRoot = 'https://pl.reactjs.org';
12-
const version = '16.13.0';
13-
=======
14-
const urlRoot = 'https://reactjs.org';
1511
const version = '16.13.1';
16-
>>>>>>> 7e4f503d86bee08b88eed77a6c9d06077863a27c
1712
const babelURL = 'https://unpkg.com/babel-standalone@6.26.0/babel.min.js';
1813

1914
export {babelURL, urlRoot, version};

0 commit comments

Comments
 (0)