Skip to content

Commit 155383e

Browse files
authored
Update package.json
1 parent d11b668 commit 155383e

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

package.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,8 @@
6262
"node": "12.x.x || 14.x.x || 15.x.x",
6363
"yarn": "^1.3.2"
6464
},
65-
<<<<<<< HEAD
6665
"homepage": "https://ru.reactjs.org/",
67-
"keywords": [
68-
"gatsby"
69-
],
70-
=======
71-
"homepage": "https://reactjs.org/",
7266
"keywords": [],
73-
>>>>>>> f2158e36715acc001c8317e20dc4f45f9e2089f3
7467
"license": "CC",
7568
"main": "n/a",
7669
"repository": {

0 commit comments

Comments
 (0)