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

Issue 132 Conflict Error - Corrected

This commit is contained in:
Susan Quigley 2019-07-29 20:27:50 +00:00
parent 49ec328dc1
commit bc89d3b793
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/figs-hypo/01.md
View File

@ -65,9 +65,6 @@ Use your language's ways of showing these kinds of things.
### Translation Strategies
<<<<<<< HEAD
There are no translation strategies for this topic.
=======
There are not translation strategies for this topic.
>>>>>>> Conform file to have EOL at end