forked from WA-Catalog/en_tn
Resolved conflict
This commit is contained in:
parent
48477f9ddb
commit
855a2b5dcb
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue