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/web/tailwind.config.js
+++ b/packages/web/tailwind.config.js
@@ -59,6 +59,7 @@ module.exports = {
      minHeight: {
        1: '0.25rem',
        2: '0.5rem',
+        11: '2.75rem',
      },
      maxHeight: {
        110: '27.5rem',