Fix conflicts

Signed-off-by: Matt Lord <[email protected]>
vitessio · Sep 12, 2024 · b4dc7f3 · b4dc7f3
1 parent 369f7ac
commit b4dc7f3
Showing 1 changed file with 20 additions and 31 deletions.
diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json