forked from WycliffeAssociates/en_tm
Issue 132 Conflict Error - Corrected
This commit is contained in:
parent
49ec328dc1
commit
bc89d3b793
|
@ -65,9 +65,6 @@ Use your language's ways of showing these kinds of things.
|
||||||
|
|
||||||
### Translation Strategies
|
### Translation Strategies
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
There are no translation strategies for this topic.
|
There are no translation strategies for this topic.
|
||||||
=======
|
|
||||||
There are not translation strategies for this topic.
|
|
||||||
|
|
||||||
>>>>>>> Conform file to have EOL at end
|
|
||||||
|
|
Loading…
Reference in New Issue