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

Resolved conflict

This commit is contained in:
Henry Whitney 2018-06-28 10:13:45 -04:00
parent 48477f9ddb
commit 855a2b5dcb
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
act/13/50.md
View File

@ -24,9 +24,5 @@ The word "they" here probably refers to the devout women and the leading men. Th
# region
<<<<<<< HEAD
Here this word refers to the area that the people of the city considered their own, not to land within an official government border.
=======
Here this word refers to the area that the people of the city considered their own, not to land within an official government border.
>>>>>>> c18ee64ed3445827e2e16ea2b248c6b375300f7e