feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)
This commit is contained in:
Binary file not shown.
BIN
.yarn/cache/@ariakit-core-npm-0.2.4-c56bded4d3-be795380e7.zip
vendored
Normal file
BIN
.yarn/cache/@ariakit-core-npm-0.2.4-c56bded4d3-be795380e7.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@ariakit-react-core-npm-0.2.8-467895afc1-aeb94f4cb8.zip
vendored
Normal file
BIN
.yarn/cache/@ariakit-react-core-npm-0.2.8-467895afc1-aeb94f4cb8.zip
vendored
Normal file
Binary file not shown.
Binary file not shown.
BIN
.yarn/cache/@ariakit-react-npm-0.2.8-b4d81a4292-8d974628e8.zip
vendored
Normal file
BIN
.yarn/cache/@ariakit-react-npm-0.2.8-b4d81a4292-8d974628e8.zip
vendored
Normal file
Binary file not shown.
BIN
.yarn/cache/fast-diff-npm-1.3.0-9f19e3b743-d22d371b99.zip
vendored
Normal file
BIN
.yarn/cache/fast-diff-npm-1.3.0-9f19e3b743-d22d371b99.zip
vendored
Normal file
Binary file not shown.
Reference in New Issue
Block a user