self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-04-11 11:12:03 +02:00
Code Issues Releases Activity

Doc: grammar fix (#5366)

Browse Source
This commit is contained in:
Trent Larson 2021-08-22 02:37:55 -07:00 committed by GitHub
parent 50f421c5d9
commit 2ae51acd29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme/conflict.md
View File

@ -1,6 +1,6 @@
# What is a conflict?
A conflict happens when one note or one attachment is modified in two different places, and then synchronised. In that case, it not possible to determine which version of the note or attachment you want to keep, and thus a conflict is generated.
A conflict happens when one note or one attachment is modified in two different places, and then synchronised. In that case, it is not possible to determine which version of the note or attachment you want to keep, and thus a conflict is generated.
# What happens in case of a conflict?