Skip to content

Commit 79a9858

Browse files
committed
fix: resolve merge conflicts with main
2 parents c31c1a3 + ff2c56a commit 79a9858

2 files changed

Lines changed: 69 additions & 11 deletions

File tree

generated/DEPENDENCIES.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "3.6.0",
2+
"version": "3.7.0",
33
"name": "@optave/codegraph",
44
"problems": [
55
"extraneous: @emnapi/runtime@1.8.1 /home/runner/work/ops-codegraph-tool/ops-codegraph-tool/node_modules/@emnapi/runtime",
@@ -756,8 +756,8 @@
756756
"@optave/codegraph-darwin-x64": {},
757757
"@optave/codegraph-linux-arm64-gnu": {},
758758
"@optave/codegraph-linux-x64-gnu": {
759-
"version": "3.6.0",
760-
"resolved": "https://registry.npmjs.org/@optave/codegraph-linux-x64-gnu/-/codegraph-linux-x64-gnu-3.6.0.tgz",
759+
"version": "3.7.0",
760+
"resolved": "https://registry.npmjs.org/@optave/codegraph-linux-x64-gnu/-/codegraph-linux-x64-gnu-3.7.0.tgz",
761761
"overridden": false
762762
},
763763
"@optave/codegraph-linux-x64-musl": {},

package-lock.json

Lines changed: 66 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)