From 07cfd74506288677583ff19cad9a197c9c28db58 Mon Sep 17 00:00:00 2001 From: Muhammad Ali Date: Tue, 20 Aug 2024 14:56:56 +0500 Subject: [PATCH] Delete docs/help/contents/merge-conflict.md Signed-off-by: Muhammad Ali --- docs/help/contents/merge-conflict.md | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 docs/help/contents/merge-conflict.md diff --git a/docs/help/contents/merge-conflict.md b/docs/help/contents/merge-conflict.md deleted file mode 100644 index cebccb3e3..000000000 --- a/docs/help/contents/merge-conflict.md +++ /dev/null @@ -1,9 +0,0 @@ -# Merge Conflicts - -Merge conflicts occur when there are conflicting note edits on your devices for the same note. - -Lets suppose that you have two devices running Notesnook: 1. a desktop and 2. a mobile. Suppose that one of your devices is offline (in this case your mobile phone). Now if you make edits to the same note on both your devices and then synched them both a merge conflict will occur. - - - -