A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
mobile: support showing diff of conflicted note
Ammar Ahmedd13ff079a4da
diff --git a/apps/mobile/app/components/merge-conflicts/index.js b/apps/mobile/app/components/merge-conflicts/index.jsindex 8c021b103..f26a39a23 100644--- a/apps/mobile/app/components/merge-conflicts/index.js+++ b/apps/mobile/app/components/merge-conflicts/index.js@@ -47,6 +47,7 @@ import { Button } from "../ui/button";import { IconButton } from "../ui/icon-button";import Seperator from "../ui/seperator";import Paragraph from "../ui/typography/paragraph";+import { diff } from "diffblazer";const MergeConflicts = () => {const { colors } = useThemeColors();@@ -322,7 +323,10 @@ const MergeConflicts = () => {if (!note) return;loadContent({id: note.id,- data: content.current.data+ data: diff(+ content.current.conflicted.data,+ content.current.data+ )});}}/>