fix: rebase on master and resolve package conflicts

openedx · Feb 27, 2023 · 697e43b · 697e43b
1 parent a298bf5
commit 697e43b
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/package-lock.json b/package-lock.json