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

Resolve conflict

This commit is contained in:
Henry Whitney 2019-07-08 14:59:10 -04:00
parent 6ecb867fef
commit 337ffa802b
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jit/figs-metaphorparts/title.md
View File

@ -1,6 +1,2 @@
<<<<<<< HEAD
Parts of a Metaphor
=======
Parts a Metaphor
>>>>>>> Conform file to have EOL at end