From d83e640b4bae925860fda5d07fa5ee556afc9d1b Mon Sep 17 00:00:00 2001 From: Divyansh Singh <40380293+brc-dd@users.noreply.github.com> Date: Thu, 7 Jul 2022 19:22:35 +0530 Subject: [PATCH] fix: merge conflicts in lockfile --- pnpm-lock.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d528f275..332d5016 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -76,7 +76,7 @@ importers: '@docsearch/js': 3.1.1 '@vitejs/plugin-vue': 3.0.0-beta.1_gsdjzz3hbcro3set7v2rc2jro4 '@vue/devtools-api': 6.2.0 - '@vueuse/core': 8.8.0_vue@3.2.37 + '@vueuse/core': 8.9.0_vue@3.2.37 body-scroll-lock: 4.0.0-beta.0 shiki: 0.10.1 vite: 3.0.0-beta.7