Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/template/forks/polyipseity'
Browse files Browse the repository at this point in the history
Signed-off-by: William So <polyipseity@gmail.com>

# Conflicts:
#	package-lock.json
#	package.json
#	pnpm-lock.yaml
  • Loading branch information
polyipseity committed Sep 12, 2023
2 parents 3b251be + 1954fb1 commit d3eeeb9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@aidenlx/esbuild-plugin-inline-worker": "^1.0.1",
"@codemirror/state": "^6.2.1",
"@codemirror/view": "^6.18.1",
"@polyipseity/obsidian-plugin-library": "^1.19.0",
"@polyipseity/obsidian-plugin-library": "^1.20.0",
"@ts-morph/bootstrap": "^0.20.0",
"acorn": "^8.10.0",
"acorn-walk": "^8.2.0",
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d3eeeb9

Please sign in to comment.