Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-06 13:26:01 +01:00
Code Issues Packages Projects Releases Activity

feat(docs): improve documentation, add icons, reorganize

Browse Source
This commit is contained in:
Elian Doran
2025-03-29 13:02:03 +02:00
parent 5ae6b18762
commit 0982a0e503
172 changed files with 4995 additions and 4421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/User Guide/User Guide/Installation & Setup/Synchronization.md
View File

@@ -63,7 +63,7 @@ This will disable TLS certificate verification, significantly reducing security
### Conflict Resolution
If you edit the same note on multiple instances before synchronization, Trilium resolves conflicts by retaining the newer change and discarding the older one. The older version remains accessible in [note revisions](../Basic%20Concepts/Note/Note%20Revisions.md), allowing data recovery if needed.
If you edit the same note on multiple instances before synchronization, Trilium resolves conflicts by retaining the newer change and discarding the older one. The older version remains accessible in [note revisions](../Basic%20Concepts%20and%20Features/Notes/Note%20Revisions.md), allowing data recovery if needed.
### Hash Check