Skip to content

Commit

Permalink
Resolved merge conflict in pnpm-lock.yaml
Browse files Browse the repository at this point in the history
  • Loading branch information
intercepted16 committed Jun 2, 2024
2 parents 99c5b40 + 9fdb968 commit 1871eda
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { preferences } from './stores'
preferences.subscribe(...) // subscribe to changes
preferences.update(...) // update value
preferences.set(...) // set value
preferences.reset() // reset to initial value
get(preferences) // read value
$preferences // read value with automatic subscription
```
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"test": "vitest"
},
"devDependencies": {
"@babel/core": "^7.24.4",
"@babel/core": "^7.24.6",
"@babel/preset-env": "^7.24.5",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
Expand All @@ -37,12 +37,12 @@
"eslint": "^8.57.0",
"jsdom": "^24.0.0",
"publint": "^0.2.8",
"rollup": "^3.28.1",
"rollup-plugin-svelte": "^7.1.0",
"rollup": "^4.18.0",
"rollup-plugin-svelte": "^7.2.0",
"semantic-release": "23.0.8",
"svelte": "^4.2.1",
"svelte": "^4.2.17",
"tsup": "^8.0.2",
"typescript": "^4.9.5",
"typescript": "^5.4.5",
"vitest": "^1.6.0"
},
"peerDependencies": {
Expand Down

0 comments on commit 1871eda

Please sign in to comment.