omegatwb
/
fr_tm
forked from WA_Training/fr_tm
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

132 Conflict Error - Corrected

This commit is contained in:
Susan Quigley 2019-07-29 20:24:43 +00:00
parent 271345efba
commit 49ec328dc1
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jit/translate-versebridge/sub-title.md
View File

@ -1,6 +1,3 @@
<<<<<<< HEAD
Why are some verse numbers combined, such as "3-5" or "17-18"?
=======
Why are some verse numbers combined, such as “3-5” or “17-18”?
>>>>>>> Conform file to have EOL at end