2 Commits

Author	SHA1	Message	Date
Aman Harwara	59fbf6f4c3	refactor: readonly note content	2023-06-26 16:12:35 +05:30
Aman Harwara	e0e9249334	feat: Added a conflict resolution dialog and a Conflicts view for easier management of conflicts (#2337)	2023-06-25 14:27:51 +05:30