From f74a54d352735cf9dd71d5404b7876d2ab4c30f5 Mon Sep 17 00:00:00 2001
From: ryanchristo <12519942+ryanchristo@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:28:35 -0700
Subject: [PATCH] resolve conflicts

---
 docs/package.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/package.json b/docs/package.json
index 5409dff1cd..980e7593e5 100644
--- 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"
   }