From 95cda32487473946a8ffd44d5d751d828de28909 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 24 Apr 2022 21:11:25 +0900
Subject: [PATCH] fix

---
 packages/client/package.json | 4 ----
 packages/client/yarn.lock    | 7 -------
 2 files changed, 11 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 2650092297..515e2e7f3e 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -85,12 +85,8 @@
 		"uuid": "8.3.2",
 		"v-debounce": "0.1.2",
 		"vanilla-tilt": "1.7.2",
-<<<<<<< HEAD
 		"vite": "2.9.5",
-		"vue": "3.2.31",
-=======
 		"vue": "3.2.33",
->>>>>>> develop
 		"vue-loader": "17.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vue-router": "4.0.14",
diff --git a/packages/client/yarn.lock b/packages/client/yarn.lock
index b47f0dbdef..965109d000 100644
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
@@ -651,22 +651,15 @@
   resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
   integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
 
-<<<<<<< HEAD
 "@vitejs/plugin-vue@2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@vitejs/plugin-vue/-/plugin-vue-2.3.1.tgz#5f286b8d3515381c6d5c8fa8eee5e6335f727e14"
   integrity sha512-YNzBt8+jt6bSwpt7LP890U1UcTOIZZxfpE5WOJ638PNxSEKOqAi0+FSKS0nVeukfdZ0Ai/H7AFd6k3hayfGZqQ==
 
-"@vue/compiler-core@3.2.31":
-  version "3.2.31"
-  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.31.tgz#d38f06c2cf845742403b523ab4596a3fda152e89"
-  integrity sha512-aKno00qoA4o+V/kR6i/pE+aP+esng5siNAVQ422TkBNM6qA4veXiZbSe8OTXHXquEi/f6Akc+nLfB4JGfe4/WQ==
-=======
 "@vue/compiler-core@3.2.33":
   version "3.2.33"
   resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.33.tgz#e915d59cce85898f5c5cfebe4c09e539278c3d59"
   integrity sha512-AAmr52ji3Zhk7IKIuigX2osWWsb2nQE5xsdFYjdnmtQ4gymmqXbjLvkSE174+fF3A3kstYrTgGkqgOEbsdLDpw==
->>>>>>> develop
   dependencies:
     "@babel/parser" "^7.16.4"
     "@vue/shared" "3.2.33"