mirror of
https://github.com/zadam/trilium.git
synced 2025-10-20 15:19:01 +02:00
docs(readme): fix leftover merge marker
This commit is contained in:
parent
e8cbce855e
commit
24ba17b3f3
@ -6,7 +6,6 @@
|
||||
[](https://app.relative-ci.com/projects/Di5q7dz9daNDZ9UXi0Bp)
|
||||
|
||||
[English](./README.md) | [Chinese](./docs/README-ZH_CN.md) | [Russian](./docs/README.ru.md) | [Japanese](./docs/README.ja.md) | [Italian](./docs/README.it.md) | [Spanish](./docs/README.es.md)
|
||||
>>>>>>> old/develop
|
||||
|
||||
TriliumNext Notes is a free and open-source, cross-platform hierarchical note taking application with focus on building large personal knowledge bases.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user