DCS-Mirror
/
unfoldingWord_en_ust
mirror of https://git.door43.org/unfoldingWord/en_ust
2
0
Fork 0
Files Issues Releases Wiki Activity See in Reader

Fix Luke conflict (#730)

This commit is contained in:
Larry Sallee 2020-06-08 18:12:15 +00:00 committed by Gogs
parent 286fc4a2b0
commit f880364dee
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
43-LUK.usfm
View File

@ -2138,14 +2138,8 @@
\ts\*
\p
<<<<<<< Updated upstream
\v 7
\v 8 \zaln-s | x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="2" x-occurrences="2" x-content="καὶ"\*\zaln-s | x-strong="G54420" x-lemma="φυλάσσω" x-morph="Gr,V,PPA,NMP," x-occurrence="1" x-occurrences="1" x-content="φυλάσσοντες"\*\zaln-s | x-strong="G54380" x-lemma="φυλακή" x-morph="Gr,N,,,,,AFP," x-occurrence="1" x-occurrences="1" x-content="φυλακὰς"\*\zaln-s | x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="τῆς"\*\zaln-s | x-strong="G35710" x-lemma="νύξ" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="νυκτὸς"\*\w That|x-occurrence="1" x-occurrences="1"\w*
\w night|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*\zaln-e\*\zaln-e\*\zaln-e\*,
=======
\v 8 \zaln-s | x-strong="G54420" x-lemma="φυλάσσω" x-morph="Gr,V,PPA,NMP," x-occurrence="1" x-occurrences="1" x-content="φυλάσσοντες"\*\zaln-s | x-strong="G54380" x-lemma="φυλακή" x-morph="Gr,N,,,,,AFP," x-occurrence="1" x-occurrences="1" x-content="φυλακὰς"\*\zaln-s | x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="τῆς"\*\zaln-s | x-strong="G35710" x-lemma="νύξ" x-morph="Gr,N,,,,,GFS," x-occurrence="1" x-occurrences="1" x-content="νυκτὸς"\*\w That|x-occurrence="1" x-occurrences="1"\w*
\w night|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*\zaln-e\*\zaln-e\*,
>>>>>>> Stashed changes
\zaln-s | x-strong="G15100" x-lemma="εἰμί" x-morph="Gr,V,IIA3,,P," x-occurrence="1" x-occurrences="1" x-content="ἦσαν"\*\w there|x-occurrence="1" x-occurrences="1"\w*
\w were|x-occurrence="1" x-occurrences="2"\w*\zaln-e\*
\zaln-s | x-strong="G25320" x-lemma="καί" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="2" x-content="καὶ"\*\zaln-s | x-strong="G41660" x-lemma="ποιμήν" x-morph="Gr,N,,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="ποιμένες"\*\w some|x-occurrence="1" x-occurrences="1"\w*
@ -9409,14 +9403,8 @@
\w expecting|x-occurrence="1" x-occurrences="1"\w*
\w someone|x-occurrence="1" x-occurrences="1"\w*
\w else|x-occurrence="1" x-occurrences="1"\w*?”
<<<<<<< Updated upstream
\v 19
\v 20 \zaln-s | x-strong="G38540" x-lemma="παραγίνομαι" x-morph="Gr,V,PAM,NMP," x-occurrence="1" x-occurrences="1" x-content="παραγενόμενοι"\*\zaln-s | x-strong="G11610" x-lemma="δέ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="δὲ"\*\w When|x-occurrence="1" x-occurrences="1"\w*
\w those|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
=======
\v 20 \zaln-s | x-strong="G38540" x-lemma="παραγίνομαι" x-morph="Gr,V,PAM,NMP," x-occurrence="1" x-occurrences="1" x-content="παραγενόμενοι"\*\w When|x-occurrence="1" x-occurrences="1"\w*
\w those|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*
>>>>>>> Stashed changes
\zaln-s | x-strong="G35880" x-lemma="ὁ" x-morph="Gr,EA,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="οἱ"\*\zaln-s | x-strong="G04350" x-lemma="ἀνήρ" x-morph="Gr,N,,,,,NMP," x-occurrence="1" x-occurrences="1" x-content="ἄνδρες"\*\w two|x-occurrence="1" x-occurrences="1"\w*
\w men|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*
\zaln-s | x-strong="G38540" x-lemma="παραγίνομαι" x-morph="Gr,V,PAM,NMP," x-occurrence="1" x-occurrences="1" x-content="παραγενόμενοι"\*\zaln-s | x-strong="G11610" x-lemma="δέ" x-morph="Gr,CC,,,,,,,," x-occurrence="1" x-occurrences="1" x-content="δὲ"\*\w came|x-occurrence="1" x-occurrences="1"\w*\zaln-e\*\zaln-e\*