resolve conflicts

regen-network · Jul 6, 2023 · f74a54d · f74a54d
1 parent 87b18d2
commit f74a54d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -18,12 +18,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-<<<<<<< HEAD
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.63",
-=======
     "@snippetors/vuepress-plugin-code-copy": "^1.2.3",
-    "@vuepress/plugin-google-analytics": "^2.0.0-beta.64",
->>>>>>> 763d14bc (docs: add copy to clip for code snippets (#1981))
+    "@vuepress/plugin-google-analytics": "^2.0.0-beta.63",
     "dotenv": "^16.3.1",
     "vuepress-vite": "^2.0.0-beta.63"
   }