From f34c459c6bc27b702ba715672f9bd780e8977c98 Mon Sep 17 00:00:00 2001 From: Christos Arvanitis Date: Tue, 7 May 2024 21:24:16 +0300 Subject: [PATCH] fix(tasksView): Resolving conflicts on yarn.lock backport (#10099) * feat(taskView): Implement opt-in paginated request for TaskView (#10093) * feat(tasksview): Allowing opt-in pagination for tasks view loading * feat(taskView): Implement opt-in paginated request for TaskView (cherry picked from commit 5fa1e96b90c7398338d67ef7a7337ee3628591bd) * fix(tasksView): Resolving conflicts on yarn.lock backport --- yarn.lock | 7 ------- 1 file changed, 7 deletions(-) diff --git a/yarn.lock b/yarn.lock index c31d941f308..ff1723e3835 100644 --- a/yarn.lock +++ b/yarn.lock @@ -18137,17 +18137,10 @@ vite-plugin-svgr@^0.3.0: dependencies: "@svgr/core" "^5.5.0" -<<<<<<< HEAD vite@2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/vite/-/vite-2.4.2.tgz#07d00615775c808530bc9f65641062b349b67929" integrity sha512-2MifxD2I9fjyDmmEzbULOo3kOUoqX90A58cT6mECxoVQlMYFuijZsPQBuA14mqSwvV3ydUsqnq+BRWXyO9Qa+w== -======= -vite@2.9.18: - version "2.9.18" - resolved "https://registry.yarnpkg.com/vite/-/vite-2.9.18.tgz#74e2a83b29da81e602dac4c293312cc575f091c7" - integrity sha512-sAOqI5wNM9QvSEE70W3UGMdT8cyEn0+PmJMTFvTB8wB0YbYUWw3gUbY62AOyrXosGieF2htmeLATvNxpv/zNyQ== ->>>>>>> 5fa1e96b90 (feat(taskView): Implement opt-in paginated request for TaskView (#10093)) dependencies: esbuild "^0.12.8" postcss "^8.3.5"