docs(readme): fix leftover merge marker

This commit is contained in:
Elian Doran 2025-06-21 17:24:06 +03:00
parent e8cbce855e
commit 24ba17b3f3
No known key found for this signature in database

View File

@ -6,7 +6,6 @@
[![RelativeCI](https://badges.relative-ci.com/badges/Di5q7dz9daNDZ9UXi0Bp?branch=develop&style=flat-square)](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.