rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)

Browse Source
This commit is contained in:
Aman Harwara
2023-06-25 14:27:51 +05:30
committed by GitHub
parent 49d43fd14b
commit e0e9249334
48 changed files with 1201 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/web/package.json
View File

@@ -107,8 +107,9 @@
"app/**/*.{js,ts,jsx,tsx,css,md}": "prettier --write"
},
"dependencies": {
"@ariakit/react": "^0.2.1",
"@ariakit/react": "^0.2.8",
"@lexical/headless": "0.11.0",
"@radix-ui/react-slot": "^1.0.1"
"@radix-ui/react-slot": "^1.0.1",
"fast-diff": "^1.3.0"
}
}