Skip to content

Commit 3565df6

Browse files
committed
Resolve merge conflicts
2 parents ec8d597 + 16deaed commit 3565df6

File tree

3 files changed

+63
-63
lines changed

3 files changed

+63
-63
lines changed

.changeset/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
"baseBranch": "dev",
99
"updateInternalDependencies": "patch",
1010
"ignore": []
11-
}
11+
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@
6969
"svelte": "./dist/index.js",
7070
"types": "./dist/index.d.ts",
7171
"type": "module"
72-
}
72+
}

pnpm-lock.yaml

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

0 commit comments

Comments
 (0)