diff --git a/02/22.txt b/02/22.txt index 42a6d6c..d34a904 100644 --- a/02/22.txt +++ b/02/22.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 22 ¿ ma‘ch‘aa te yak ta lote ja‘ nax te mach‘a ya smuk tayot‘an te Jesus te ja‘te Cristoe? ja‘ me tu ja‘ te lutil Cristoe, melei ya smuk ta yot‘an te tatile sok te nich‘anile. \v 23 Mayuk te mach‘a ya smuk tayu‘an te nich‘anile, mayuk ta swenta te tatile, mach‘a te ya xchuun te nich‘anile ay nix ta swentauk te tatile. -======= -\v 23 \v 22 . ->>>>>>> 7436541bba63ac6eb46980350e2729778f8554cd +\v 22 ¿ ma‘ch‘aa te yak ta lote ja‘ nax te mach‘a ya smuk tayot‘an te Jesus te ja‘te Cristoe? ja‘ me tu ja‘ te lutil Cristoe, melei ya smuk ta yot‘an te tatile sok te nich‘anile. \v 23 Mayuk te mach‘a ya smuk tayu‘an te nich‘anile, mayuk ta swenta te tatile, mach‘a te ya xchuun te nich‘anile ay nix ta swentauk te tatile. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 26b9eb2..1b908cd 100644 --- a/manifest.json +++ b/manifest.json @@ -35,20 +35,36 @@ "translators": [ "Rebekah Reyna", "Jeffrey Feliciano Soto", - "Gabriela Castro" + "Gabriela Castro", + "Zahir" ], "finished_chunks": [ + "01-title", + "01-01", + "01-03", + "01-05", + "01-08", + "02-title", "02-01", "02-04", - "02-title", "02-07", "02-09", "02-12", "02-15", "02-18", "02-20", + "02-22", "02-24", "02-27", + "03-01", + "03-04", + "03-07", + "03-09", + "03-11", + "03-13", + "03-16", + "03-19", + "03-23", "04-title", "04-01", "04-04", @@ -61,20 +77,6 @@ "05-13", "05-16", "05-18", - "05-20", - "01-title", - "01-01", - "01-03", - "01-05", - "01-08", - "03-01", - "03-04", - "03-07", - "03-09", - "03-11", - "03-13", - "03-16", - "03-19", - "03-23" + "05-20" ] } \ No newline at end of file