From 618b741afda1fa5f9fa558606f40b0337e3adced Mon Sep 17 00:00:00 2001 From: mitikiwostky Date: Wed, 7 Nov 2018 12:46:19 -0400 Subject: [PATCH] Wed Nov 07 2018 12:46:19 GMT-0400 (SA Western Standard Time) --- 01/01.txt | 6 +- 06/14.txt | 6 +- manifest.json | 173 +++++++++++++++++++++++++------------------------- 3 files changed, 89 insertions(+), 96 deletions(-) diff --git a/01/01.txt b/01/01.txt index 2849c95..f9a35ae 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\c 1 \v 1 I paṫ katiniuyutsutṫani ti hekwa yuawitsie ti mieme, Jesus yutsi núaaya. \v 2 Kemure uxa Isaias tsie yutsiniukeya tuayame : "ena niuki tuayame ne naun nṫamṫkṫ a huye kani ta heitseriyamṫkṫ. \v 3 Niuki kana hiwani makumawitsie : re ukiyari huye rekene heitseririeka. -======= -\c 1 \v 1 I paṫ katiniuyutsutṫani ti hekwa yuawitsie ti mieme, Jesus yutsi núaaya. \v 2 Kemure uxa Isaias tsie yutsiniukeya tuayame: "ena niuki tuayame ne naun nṫamṫkṫ a huye kani ta heitseriyamṫkṫ. \v 3 Niuki kana hiwani makumawitsie: re ukiyari huye rekene heitseririeka. ->>>>>>> ec654edaa282b306229014aa6aec2583a7db2b38 +\c 1 \v 1 I paṫ katiniuyutsutṫani ti hekwa yuawitsie ti mieme, Jesus yutsi núaaya. \v 2 Kemure uxa Isaias tsie yutsiniukeya tuayame: "ena niuki tuayame ne naun nṫamṫkṫ a huye kani ta heitseriyamṫkṫ. \v 3 Niuki kana hiwani makumawitsie: re ukiyari huye rekene heitseririeka. \ No newline at end of file diff --git a/06/14.txt b/06/14.txt index 4807d50..08d506e 100644 --- a/06/14.txt +++ b/06/14.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 14 iTs+kame Herodes pu'eni ik+, Jesùs xeik+ame pumaikai naiTsarie, Hipa+ me pait+ka. Juan Bautista. panukuke muk+te waHa Ts+a, ya imieme ya putikuxata ik+. \v 15 H+pat+me mait+katei: "m+k+ pu Elias", H+pat+ me pait+ka +ei: m+k+ nuk+ Tuayame p+H+k+, meripait+ mieme -======= -\v 14 Itsṫkame Herodes pu´eni ikṫ, Jesus xeikṫa me oumaikai nuitsarie, hipaṫ me paitṫka, Juan Bautista. Panukule mukṫte wahatsṫa, yaimieme ya putikuxata ikṫ. \v 15 Hṫpatṫme maitikatei: "mṫkṫ pu Elias", hṫpatṫ me paitṫka tei: mṫkṫ nukṫ Tuayame pṫhṫkṫ, meripaiti mieme. ->>>>>>> branch 'master' of git@git.door43.org:wendyc/hch-x-huicholesdeleste_mrk_text_reg.git +\v 14 \v 15 Conflict Parsing Error \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1a8602f..17fea23 100644 --- a/manifest.json +++ b/manifest.json @@ -27,8 +27,8 @@ "language_id": "en", "resource_id": "ulb", "checking_level": "3", - "date_modified": 20161227, - "version": "8" + "date_modified": 20170329, + "version": "9" } ], "parent_draft": {}, @@ -49,6 +49,7 @@ "finished_chunks": [ "front-title", "01-title", + "01-01", "01-04", "01-07", "01-09", @@ -82,6 +83,13 @@ "02-25", "02-27", "03-title", + "03-01", + "03-03", + "03-05", + "03-07", + "03-09", + "03-11", + "04-title", "04-01", "04-03", "04-06", @@ -98,6 +106,7 @@ "04-35", "04-38", "04-40", + "05-title", "05-01", "05-03", "05-05", @@ -122,7 +131,38 @@ "06-07", "06-10", "06-12", + "06-14", + "06-16", + "06-18", + "06-21", + "06-23", + "06-26", + "06-30", + "06-33", + "06-35", + "06-37", + "06-39", + "06-42", + "06-45", + "06-48", + "06-51", + "06-53", + "06-56", + "07-01", + "07-02", + "07-05", + "07-06", + "07-08", + "07-11", + "07-14", + "07-17", + "07-20", + "07-24", "07-27", + "07-29", + "07-31", + "07-33", + "07-36", "08-01", "08-05", "08-07", @@ -139,8 +179,50 @@ "08-33", "08-35", "08-38", + "09-title", + "09-01", + "09-04", + "09-07", + "09-09", + "09-11", + "09-14", + "09-17", + "09-20", + "09-23", + "09-26", + "09-28", "10-title", "10-01", + "10-05", + "10-07", + "10-10", + "10-13", + "10-15", + "10-17", + "10-20", + "10-23", + "10-26", + "10-29", + "10-32", + "10-35", + "10-38", + "10-41", + "10-43", + "10-46", + "10-49", + "10-51", + "11-01", + "11-04", + "11-07", + "11-11", + "11-13", + "11-15", + "11-17", + "11-20", + "11-22", + "11-24", + "11-27", + "11-29", "12-title", "12-01", "12-04", @@ -160,6 +242,8 @@ "12-41", "12-43", "13-title", + "13-01", + "13-03", "13-05", "13-07", "13-09", @@ -227,89 +311,6 @@ "16-12", "16-14", "16-17", - "16-19", - "06-16", - "06-18", - "06-21", - "06-23", - "06-26", - "06-30", - "06-33", - "06-35", - "06-37", - "06-39", - "06-42", - "06-45", - "06-51", - "06-53", - "06-48", - "06-56", - "06-14", - "03-01", - "03-03", - "03-05", - "03-07", - "03-09", - "03-11", - "04-title", - "05-title", - "09-title", - "09-01", - "09-04", - "09-07", - "09-09", - "09-11", - "09-14", - "09-17", - "09-20", - "09-23", - "09-26", - "09-28", - "07-01", - "07-02", - "07-05", - "07-06", - "07-08", - "07-11", - "07-14", - "07-17", - "07-20", - "07-24", - "07-29", - "07-31", - "07-33", - "07-36", - "10-05", - "10-07", - "10-10", - "10-13", - "10-15", - "10-17", - "10-20", - "10-23", - "10-26", - "10-29", - "10-32", - "10-35", - "10-38", - "10-41", - "10-43", - "10-46", - "10-49", - "10-51", - "11-01", - "11-04", - "11-07", - "11-11", - "11-13", - "11-15", - "11-17", - "11-20", - "11-22", - "11-24", - "11-27", - "11-29", - "13-01", - "13-03" + "16-19" ] } \ No newline at end of file