forked from WycliffeAssociates/en_tm
132 Conflict Error - Corrected
This commit is contained in:
parent
271345efba
commit
49ec328dc1
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue