9 Commits

Author	SHA1	Message	Date
ammarahm-ed	41df9483e7	fix empty note creation	2020-04-11 12:16:05 +05:00
ammarahm-ed	75e3540a8b	fix background of merge-editor	2020-04-11 11:11:42 +05:00
ammarahm-ed	dec9a9c192	fix delta resolving	2020-04-07 10:22:17 +05:00
ammarahm-ed	52c2cf13df	update	2020-04-06 13:14:27 +05:00
ammarahm-ed	937dd5be37	update quill	2020-04-06 11:37:20 +05:00
ammarahm-ed	c97f669e01	handle conflicted note	2020-03-31 10:55:19 +05:00
ammarahm-ed	3c34a75cfb	fix merge	2020-03-26 15:50:10 +05:00
ammarahm-ed	4d7af5c3ac	add merging	2020-03-26 15:42:37 +05:00
ammarahm-ed	df9f4e8d66	add note merging ui flow	2020-03-26 13:39:04 +05:00