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

2023-06-25 14:27:51 +05:30
parent 49d43fd14b
commit e0e9249334
48 changed files with 1201 additions and 94 deletions
--- a/packages/styles/src/Styles/_scrollbar.scss
+++ b/packages/styles/src/Styles/_scrollbar.scss
@@ -1,7 +1,8 @@
 .windows-web,
 .windows-desktop,
 .linux-web,
-.linux-desktop {
+.linux-desktop,
+.force-custom-scrollbar {
  $thumb-width: 4px;

  ::-webkit-scrollbar {