Skip to content

Commit

Permalink
refactor: fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
thetutlage committed Mar 15, 2023
1 parent b2e72ca commit 97af746
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@
"@japa/runner": "^2.5.1",
"@japa/spec-reporter": "^1.3.3",
"@swc/core": "^1.3.40",
"@types/fs-extra": "^11.0.1",
"@types/node": "^18.15.3",
"@types/pretty-hrtime": "^1.0.1",
"@types/sinon": "^10.0.13",
Expand Down Expand Up @@ -157,7 +156,6 @@
"@sindresorhus/is": "^5.3.0",
"@types/he": "^1.2.0",
"execa": "^7.1.0",
"fs-extra": "^11.1.0",
"he": "^1.2.0",
"parse-imports": "^1.1.0",
"pretty-hrtime": "^1.0.3",
Expand Down

0 comments on commit 97af746

Please sign in to comment.