cleaned up merge conflict artifacts

This commit is contained in:
root committed 2024-12-08 18:23:56 +01:00
1 parent 10d386e06f
commit 6345e424b0
1 file changed
-1
-1
View File
@@ -2,7 +2,6 @@
## Table of contents ## Table of contents
<<<<<<< HEAD
- [glossary](#glossary) - [glossary](#glossary)
- [terminology](#terminology) - [terminology](#terminology)
- [branches](#branches) - [branches](#branches)