Resolve conflicts in packages.json / yarn.lock

Author: smikitky

package.json

@@ -61,15 +61,8 @@
     "node": "12.x.x || 14.x.x || 15.x.x",
     "yarn": "^1.3.2"
   },
-<<<<<<< HEAD
   "homepage": "https://ja.reactjs.org/",
-  "keywords": [
-    "gatsby"
-  ],
-=======
-  "homepage": "https://reactjs.org/",
   "keywords": [],
->>>>>>> f2158e36715acc001c8317e20dc4f45f9e2089f3
   "license": "CC",
   "main": "n/a",
   "repository": {
@@ -78,14 +71,9 @@
   },
   "scripts": {
     "build": "gatsby clean && gatsby build",
-<<<<<<< HEAD
+    "build-ci": "gatsby clean && gatsby build",
     "check-all": "npm-run-all prettier generate-ids --parallel lint flow lint:text",
     "ci-check": "npm-run-all prettier:diff --parallel lint flow lint:text",
-=======
-    "build-ci": "gatsby clean && gatsby build",
-    "check-all": "npm-run-all prettier generate-ids --parallel lint flow",
-    "ci-check": "npm-run-all prettier:diff --parallel lint flow",
->>>>>>> f2158e36715acc001c8317e20dc4f45f9e2089f3
     "dev": "gatsby develop -H 0.0.0.0",
     "flow": "flow",
     "format:source": "prettier --config .prettierrc --write \"{gatsby-*.js,{flow-typed,plugins,src}/**/*.js}\"",

yarn.lock

@@ -12694,7 +12694,6 @@ pretty-format@^25.5.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-<<<<<<< HEAD
 prh@^5.4.4:
   version "5.4.4"
   resolved "https://registry.yarnpkg.com/prh/-/prh-5.4.4.tgz#5b618213a187f3580f262f4e0f79e8e8561ea179"
@@ -12704,18 +12703,10 @@ prh@^5.4.4:
     diff "^4.0.1"
     js-yaml "^3.9.1"
 
-prismjs@^1.15.0, prismjs@^1.6.0:
-  version "1.21.0"
-  resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.21.0.tgz#36c086ec36b45319ec4218ee164c110f9fc015a3"
-  integrity sha512-uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw==
-  optionalDependencies:
-    clipboard "^2.0.0"
-=======
 prismjs@^1.25.0, prismjs@^1.6.0:
   version "1.25.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.25.0.tgz#6f822df1bdad965734b310b315a23315cf999756"
   integrity sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg==
->>>>>>> f2158e36715acc001c8317e20dc4f45f9e2089f3
 
 probe-image-size@^5.0.0:
   version "5.0.0"