This commit is contained in:
Tom Warren 2016-12-27 09:30:12 -05:00
parent 53e9957582
commit 4eb4e22fd3
1 changed files with 1 additions and 6 deletions

View File

@ -6,12 +6,7 @@
\s5 \s5
\v 3 But not even Titus, who was with me and who was a Greek, was forced to be circumcised. \v 3 But not even Titus, who was with me and who was a Greek, was forced to be circumcised.
<<<<<<< HEAD \v 4 The false brothers came in secretly to spy on the liberty we have in Christ Jesus. They desired to enslave us.
\v 4 The false brothers came in secretly to spy on the liberty we have in Christ Jesus. They desired to bring us into slavery,
=======
\v 4 The false brothers came in secretly to spy on the liberty we have in Christ Jesus. They desired to reduce us to slavery,
>>>>>>> origin/master
\v 5 but we did not yield in submission to them for a moment, so that the truth of the gospel would remain with you.
\s5 \s5
\v 6 But those who seemed to be important (whatever they were does not matter to me, God shows no partiality)—those, I say, who seemed important added nothing to me. \v 6 But those who seemed to be important (whatever they were does not matter to me, God shows no partiality)—those, I say, who seemed important added nothing to me.