Trs conv: Correct issue with convention page

djvill · Oct 16, 2024 · 772aa33 · 772aa33
1 parent 6100721
commit 772aa33
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/doc/transcription/transcription-convention.md b/doc/transcription/transcription-convention.md
@@ -3,13 +3,8 @@ title: Transcription convention
 layout: default
 permalink: /doc/transcription-convention
 parent: Transcription
-<<<<<<< HEAD:doc/Transcription-Convention.md
-nav_order: 2
-last_modified_date: 2024-09-30T14:43:22-04:00
-=======
 nav_order: 10
-last_modified_date: 2024-10-15T14:54:58-04:00
->>>>>>> pages-in-progress:doc/transcription/transcription-convention.md
+last_modified_date: 2024-10-16T11:50:54-04:00
 ---