From 893c50955724cc03d34686d885ac89b3cfb76c13 Mon Sep 17 00:00:00 2001 From: paco_camacho Date: Sun, 7 Jul 2024 16:10:11 -0600 Subject: [PATCH] Sun Jul 07 2024 17:10:10 GMT-0500 (Central Daylight Time) --- 23/01.txt | 6 +----- 23/04.txt | 6 +----- 23/07.txt | 6 +----- 23/10.txt | 6 +----- manifest.json | 5 +++-- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/23/01.txt b/23/01.txt index 13738dd..3e2c3d2 100644 --- a/23/01.txt +++ b/23/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 23 \v 1 Axni David. Kaoluta xwanit, axkni, chu xamaja niy limaxtul xkwasa. Salomón pi, xapuxk nawan Israel. \v 2 Wa mamaxtukol xlipatum napulenkoy nak Israel. Chu xpalakgacguwina, puchina. Chu levitas. \v 3 Chu xlakskujni. Puchina wanti liwaka xkaljikoy puxumakaw kata. Xliputum puxamakgutsayan mil. -======= -\c 23 \v 1 Axni David kaoluta xwanit axkni chu xamaja xniy chu limaxtul, xkawasa, Salomón pi, xapuxk nawan Israel. \v 2 Wa mamaxtumekol xlipotum napulalenkoy nak Israel, chu xpalakgachuwina,puchina,chu levitas. \v 3 Chu xlakskujni xpalakaachuwina, puchina, wanti liwaka xkaljikoy puxumakaw kata. Xliputum puxamakgutsayan mil. ->>>>>>> 3fc9b36dec16fe2e587a113c6c6be764811aad9b +\c 23 \v 1 Axni David kaoluta xwanit axkni chu xamaja xniy chu limaxtul, xkawasa, Salomón pi, xapuxk nawan Israel. \v 2 Wa mamaxtumekol xlipotum napulalenkoy nak Israel, chu xpalakgachuwina,puchina,chu levitas. \v 3 Chu xlakskujni xpalakaachuwina, puchina, wanti liwaka xkaljikoy puxumakaw kata. Xliputum puxamakgutsayan mil. \ No newline at end of file diff --git a/23/04.txt b/23/04.txt index 9fc5d5b..7cdf448 100644 --- a/23/04.txt +++ b/23/04.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 4 Wa amakol, puxumatate mil wantí xlakchangoy skujnin chu akastjayaunin \v 5 Nachuna, akgtati mil makgtakgalhnanin, chu akgtati mil tiku lilakgachixkuikgoy Puchina litlakgni wa ama nikuma lilakgachixkuikan Puchina. \v 6 Chu xla pulakatunu chuna xlak kgawasan leví: Gersón, coat chu Merarí. -======= -\v 4 "Wa amakol, puxumatate mil wantí xlakchango namatgakalkoy chiki Puchina chu akchaxan mil skujnin chu akastjayaunanin. \v 5 Nachuna, akgtati mil makgtakgalhnanin, chu akgtati mil tiku lilakgachixkuikgoy Puchina litlakgni wa ama nikuma lilakgachixkuikan Puchina." \v 6 Chu xla pulakatunu kawilih chuna iha xlak kgawasan leví: Gersón, Coat chu Merari. ->>>>>>> 3fc9b36dec16fe2e587a113c6c6be764811aad9b +\v 4 "Wa amakol, puxumatate mil wantí xlakchango namatgakalkoy chiki Puchina chu akchaxan mil skujnin chu akastjayaunanin. \v 5 Nachuna, akgtati mil makgtakgalhnanin, chu akgtati mil tiku lilakgachixkuikgoy Puchina litlakgni wa ama nikuma lilakgachixkuikan Puchina." \v 6 Chu xla pulakatunu kawilih chuna iha xlak kgawasan leví: Gersón, Coat chu Merari. \ No newline at end of file diff --git a/23/07.txt b/23/07.txt index 84af8a2..302393f 100644 --- a/23/07.txt +++ b/23/07.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 7 Laadán chu Simeí xlikiltsukun xlilakgapasni Gersón xwanti. \v 8 Kgalhtutu xkaman Laadán xtawanit; Jehiel, xa puxku Zetam chu Joel. \v 9 Nachuna kgalhtutu xtawanit xkaman Simeí: Selomit, Haziel chu Harán. Wa umakgol xalak puxku xlilakgapasni Laadán. -======= -\v 7 Laadán chu Simeí xlikiltsukun xlilakgapasni Gersón. \v 8 Kgalhtutu xkaman Laadán xtawanit:Jehiel, xa puxku, Zetam chu Joel. \v 9 Nachuna kgalhtutu xtawanit xkaman Simei: Selomit, Haziel chu Harán. Wa umakgol xalak puxku xlilakgapasni Laadán. ->>>>>>> 3fc9b36dec16fe2e587a113c6c6be764811aad9b +\v 7 Laadán chu Simeí xlikiltsukun xlilakgapasni Gersón. \v 8 Kgalhtutu xkaman Laadán xtawanit:Jehiel, xa puxku, Zetam chu Joel. \v 9 Nachuna kgalhtutu xtawanit xkaman Simei: Selomit, Haziel chu Harán. Wa umakgol xalak puxku xlilakgapasni Laadán. \ No newline at end of file diff --git a/23/10.txt b/23/10.txt index 6330b8f..a832112 100644 --- a/23/10.txt +++ b/23/10.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 10 Kgalhtati xwankgonit xkaman Simeí:Jahat, Zina, Jeús chu Beríá. \v 11 Jhat xa puxku xwanit, Zina, xli'chati, chu manwá Jeús chu Beriá. 11Jahat xa puxku xwanit, Zina xli'chati, chu manwá Jeús chu Beriá ni lhuwa xlilakgapasni xwankgonit chuna chu ka pulaktúm xlilakgapasnikan. -======= -\v 10 Kgalhtati xwankgonit xkaman Simeí: Jahat, Zina, Jeús chu Bería. \v 11 Jahat xa puxku xwanit, Zina xli'chati, chu manwá Jeús chu Bería ni ihuwa xlilakgapasni xwankgonit chuna chu ka pulaktúm xlilakgapasnikan. ->>>>>>> 3fc9b36dec16fe2e587a113c6c6be764811aad9b +\v 10 Kgalhtati xwankgonit xkaman Simeí: Jahat, Zina, Jeús chu Bería. \v 11 Jahat xa puxku xwanit, Zina xli'chati, chu manwá Jeús chu Bería ni ihuwa xlilakgapasni xwankgonit chuna chu ka pulaktúm xlilakgapasnikan. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 76e9ca1..fb17aa3 100644 --- a/manifest.json +++ b/manifest.json @@ -27,14 +27,15 @@ "language_id": "es-419", "resource_id": "ulb", "checking_level": "3", - "date_modified": "2023-08-14T14:30:22.239258+00:00", + "date_modified": "2024-02-07T22:32:48.1929688+00:00", "version": "1.9" } ], "parent_draft": {}, "translators": [ "Rayxi_cabarcas", - "Esteban_Filgueira" + "Esteban_Filgueira", + "paco_camacho" ], "finished_chunks": [ "11-01",