fix code conflict

Postcatlab · May 20, 2022 · 853f8bc · 853f8bc
1 parent 4b30850
commit 853f8bc
Showing 1 changed file with 33 additions and 33 deletions.
diff --git a/package-lock.json b/package-lock.json