Skip to content

Commit

Permalink
fix(tasksView): Resolving conflicts on yarn.lock backport (#10099)
Browse files Browse the repository at this point in the history
* 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 5fa1e96)

* fix(tasksView): Resolving conflicts on yarn.lock backport
  • Loading branch information
christosarvanitis committed May 7, 2024
1 parent 9e7a429 commit f34c459
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18137,17 +18137,10 @@ vite-plugin-svgr@^0.3.0:
dependencies:
"@svgr/core" "^5.5.0"

<<<<<<< HEAD
[email protected]:
version "2.4.2"
resolved "https://registry.yarnpkg.com/vite/-/vite-2.4.2.tgz#07d00615775c808530bc9f65641062b349b67929"
integrity sha512-2MifxD2I9fjyDmmEzbULOo3kOUoqX90A58cT6mECxoVQlMYFuijZsPQBuA14mqSwvV3ydUsqnq+BRWXyO9Qa+w==
=======
[email protected]:
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"
Expand Down

0 comments on commit f34c459

Please sign in to comment.