From e31144880b251858b0cff047afb28bdede0858c5 Mon Sep 17 00:00:00 2001 From: paco_camacho Date: Tue, 30 Jul 2024 20:50:14 -0600 Subject: [PATCH] Tue Jul 30 2024 21:50:13 GMT-0500 (Central Daylight Time) --- 14/08.txt | 6 +----- 14/10.txt | 6 +----- 14/13.txt | 6 +----- 14/15.txt | 6 +----- 21/01.txt | 6 +----- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/14/08.txt b/14/08.txt index a6dd5c5..1cadc81 100644 --- a/14/08.txt +++ b/14/08.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 8 Akgxni filisteos kaxmatkgolh pi David Sikulanalikanit la malana nakg pulantamat Israel, xliputúm xlakan ankgoln putsakgoy David, chu akgxni David katsilh aln kapaxtokga. \v 9 Chy minkgolh filisteos chu akgchipakgoln xa kaxtúm tiyat Refaím. -======= -\v 8 Akgxni filisteos kaxmatkgolh pi David Sikulanalikanit la malana nakg pulatamat Israel, xliputúm xlakan ankgolh putsakgoy David, chu akgxni David katsilh alh kapaxtokga. \v 9 Chu minkgolh filisteos chu akgchipakgolh xa kaxtúm tiyat Refaim. ->>>>>>> 0665c1c2a266f32d0e0dc017c54e3e7cfa05ba33 +\v 8 Akgxni filisteos kaxmatkgolh pi David Sikulanalikanit la malana nakg pulantamat Israel, xliputúm xlakan ankgoln putsakgoy David, chu akgxni David katsilh aln kapaxtokga. \v 9 Chy minkgolh filisteos chu akgchipakgoln xa kaxtúm tiyat Refaím. \ No newline at end of file diff --git a/14/10.txt b/14/10.txt index 2f8e262..69878ff 100644 --- a/14/10.txt +++ b/14/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Wachú David kgalhskinith Dios. Chuwanilh ¿Ka talay filisteos? PUCHINÁ Wanilh " Kakatala akit nakamakamaxan." \v 11 Chuna chu David alh nakg baal Perazim, chu antá kamakgatlajaln filisteos. Chu wá: Dios malakith xlakstipan kintaratlawana, chunala chuchut akgxní." Chunachu ama pulamat xtakuwini wanika Baal-Perazim. \v 12 Chu filisteos anta makgxtakgolh xtamakanitlawa chu David mastalh limapeksin kakalhkuyakgalg. -======= -\v 10 Whanchú David Kgakhskinilh Dios. Chuwanilh ¿Ka talay filisteos? ¿na kimakamaxiya? PUCHINÁ Wanilh " kakatala akit nakamakamayan" \v 11 Chuna chu David alh nakg baal perazim, chu antá kamakgatla filisteos, Chu wá: Dios malakilh xlakstipan kintaratlawana, chuna la chuchut akgxní Hawan." Chuna chu ama pulatamat xtakuwini wanika Baal - Perazím. \v 12 Chu filisteos anta makgxtakgolh xtamakanitlawa chu David mastalh limapeksin kakalh kuyakgalh. ->>>>>>> 0665c1c2a266f32d0e0dc017c54e3e7cfa05ba33 +\v 10 Whanchú David Kgakhskinilh Dios. Chuwanilh ¿Ka talay filisteos? ¿na kimakamaxiya? PUCHINÁ Wanilh " kakatala akit nakamakamayan" \v 11 Chuna chu David alh nakg baal perazim, chu antá kamakgatla filisteos, Chu wá: Dios malakilh xlakstipan kintaratlawana, chuna la chuchut akgxní Hawan." Chuna chu ama pulatamat xtakuwini wanika Baal - Perazím. \v 12 Chu filisteos anta makgxtakgolh xtamakanitlawa chu David mastalh limapeksin kakalh kuyakgalh. \ No newline at end of file diff --git a/14/13.txt b/14/13.txt index dd5055d..dab1b56 100644 --- a/14/13.txt +++ b/14/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Chu filisteos akgchiparaparkgoln ama katiyatni. \v 14 David tachiwinamapa Dios: Chu Dios wanilh ni kaka akgstala, ka kakalimakgstili laki na kakatalaya nakg chakgenkan, xlakg stipan kakiwin. -======= -\v 13 Chu filisteos akg chiparaparkgoln ama katiyatni. \v 14 David tachiwinampa Dios: Chu Dios wanilh ni kaka akgtala, ka kakalimakgstili laki na kakatalaya nakg chakgekan. Xlakg stipan kakiwin. ->>>>>>> 0665c1c2a266f32d0e0dc017c54e3e7cfa05ba33 +\v 13 Chu filisteos akg chiparaparkgoln ama katiyatni. \v 14 David tachiwinampa Dios: Chu Dios wanilh ni kaka akgtala, ka kakalimakgstili laki na kakatalaya nakg chakgekan. Xlakg stipan kakiwin. \ No newline at end of file diff --git a/14/15.txt b/14/15.txt index 7e33a8e..d898d3b 100644 --- a/14/15.txt +++ b/14/15.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 15 Akgxni na kgaxpata naky xkgstipun kakiwin pitamimaná filisteos, kapit chu kakatala. Whanchú PUCHINÁ DIOS na kalakatiteyan chuna kamakgawiy filisteos. \v 16 Tlawa chu David lakuntia Dios limapeksil, chu kamakgatlajal chu kamakgnil filisteos Nakg Gabaón chy antá nakg Gezer. \v 17 Chu David lakgapaska xlikalanka ama katiyatni, chu PUCHINÁ tlawá pi xplitutúm tachixkuwitat xmakg puwanikgolh. -======= -\v 15 Akgxni na kgaxpata nakg xakgstipun kakiwin pi tamimaná filisteos, kapit chu kakatala. Wanchú PUCHINÁ Dios na kalakatiteyan chu na kamakgawiy filisteos. \v 16 Tlawa chu David lakuntlia Dios limapeksil chu kamakgatlajal chu kamakgnil filisteos nakg Gabaón chu nakg Gezer. \v 17 Chu David lakgapaska xlikalanka ama katiyatni, chu PUCHINÁ tlawá pi xliputúm tachixkuwitat xmakg puwanikgolh. ->>>>>>> 0665c1c2a266f32d0e0dc017c54e3e7cfa05ba33 +\v 15 Akgxni na kgaxpata nakg xakgstipun kakiwin pi tamimaná filisteos, kapit chu kakatala. Wanchú PUCHINÁ Dios na kalakatiteyan chu na kamakgawiy filisteos. \v 16 Tlawa chu David lakuntlia Dios limapeksil chu kamakgatlajal chu kamakgnil filisteos nakg Gabaón chu nakg Gezer. \v 17 Chu David lakgapaska xlikalanka ama katiyatni, chu PUCHINÁ tlawá pi xliputúm tachixkuwitat xmakg puwanikgolh. \ No newline at end of file diff --git a/21/01.txt b/21/01.txt index 84ee459..02f87e9 100644 --- a/21/01.txt +++ b/21/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 21 \v 1 Chu akgskgeuni akilh chu taratlawa pulatamat Israel chu sakgalhil David laki xla natiaway aktúm tapultake nak pulatamat Israel. \v 2 Chu David wanilh joab nachuna xa lak, puxkúm makgtagalnam kapitit chu katlawatit taputlakan nak pulatamat Israel, nak Beerseba chu anta nak dan chuna nakilawaniyaw laki akit nak katsiy xchalhukan. \v 3 Joab wanilh: wa PUCHINÁ kaltawa xmakgtakgalnan akgtúm ciento tlak lhanja. Chu wix kimpuxku ¿Ni put'um kaskujniman? ¿Tuku xpalakata litlawaputuna umá? ¿Tuku xpalakata liliminiya tapatín pulatamat Israel? -======= -\c 21 \v 1 Chu akgsgeuni akilh chu taratlawa pulatamat Israel chu sakgalhil David laki xla natlaway aktúm taputlake nak pulatamat Israel. \v 2 Chu David wanilh jaab nachura xa lak, puxkún makgtakgalnan kapitit chu katlawatit taputlakan nak pulatamat Israel, nak Beerseba chu antá nak Dan chuna nakilawaniyaw laki akit nak katsiy xchalhukan. \v 3 Joab wanilh: Wa PUCHINÁ katlawa xmakgtakgalnan akgtúm ciento tlhanka. Chu wix kimpuxku ¿Ni putúm kaskujniman? ¿Tuku xplakata litlawaputuna umá? ¿Tuku xpalakata liliminiya tapatín pulatama Israel? ->>>>>>> 0665c1c2a266f32d0e0dc017c54e3e7cfa05ba33 +\c 21 \v 1 Chu akgskgeuni akilh chu taratlawa pulatamat Israel chu sakgalhil David laki xla natiaway aktúm tapultake nak pulatamat Israel. \v 2 Chu David wanilh joab nachuna xa lak, puxkúm makgtagalnam kapitit chu katlawatit taputlakan nak pulatamat Israel, nak Beerseba chu anta nak dan chuna nakilawaniyaw laki akit nak katsiy xchalhukan. \v 3 Joab wanilh: wa PUCHINÁ kaltawa xmakgtakgalnan akgtúm ciento tlak lhanja. Chu wix kimpuxku ¿Ni put'um kaskujniman? ¿Tuku xpalakata litlawaputuna umá? ¿Tuku xpalakata liliminiya tapatín pulatamat Israel? \ No newline at end of file