From 855a2b5dcb787b7f2386230676245e737212170c Mon Sep 17 00:00:00 2001 From: hmw3 Date: Thu, 28 Jun 2018 10:13:45 -0400 Subject: [PATCH] Resolved conflict --- act/13/50.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/act/13/50.md b/act/13/50.md index 3c453fa0dc..5846b02f48 100644 --- a/act/13/50.md +++ b/act/13/50.md @@ -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