Resolve conflicts for #4760 (#4762)

a911b856 · Yuge Zhang · GitHub · 14d2966b · a911b856 · a911b856
Unverified Commit a911b856 authored Apr 21, 2022 by Yuge Zhang Committed by GitHub Apr 21, 2022
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 76 additions and 93 deletions

ts/webui/tsconfig.json ts/webui/tsconfig.json +8 -0

ts/webui/yarn.lock ts/webui/yarn.lock +68 -93

No files found.
--- a/ts/webui/tsconfig.json
+++ b/ts/webui/tsconfig.json
--- a/ts/webui/yarn.lock
+++ b/ts/webui/yarn.lock