Aman Harwara 493d5e91f6 fix: Fixed issue where conflict resolution menu was not selectable [skip e2e]

2023-08-30 09:42:17 +05:30

..

ConflictListItem.tsx

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

2023-06-25 14:27:51 +05:30

DiffView.tsx

feat: Added Super & HTML import options in Import modal. Google Keep notes will now also be imported as Super notes, with attachments if importing from HTML (#2433)

2023-08-18 16:41:25 +05:30

NoteConflictResolutionModal.tsx

fix: Fixed issue where conflict resolution menu was not selectable [skip e2e]

2023-08-30 09:42:17 +05:30