chore(package-lock): remove git conflict, invalid versions

Invalid typescript version makes `npm ci` fail in the latest npm npm/cli#4363 Merge conflict was introduced in primer#1771
wraithgar · Feb 17, 2022 · 65fbd12 · 65fbd12
1 parent 01efa73
commit 65fbd12
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json