fix forgotten conflicts

primer · Jun 20, 2023 · a0d90a9 · a0d90a9
1 parent ad3e00e
commit a0d90a9
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json