diff --git a/04/33.txt b/04/33.txt index 3fbb430..a8bf30b 100644 --- a/04/33.txt +++ b/04/33.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 33 Wena wena awamekasa,usitae Anutu kamana omo piavuma luksavevikive,\v 34 ayaema kamana igeti eriakarake,piama kamanapa utae avorata ayaema napiwa utae awame kasanda. -======= -\v 33 \v 34 Tigeva yoke yoke puma kavima mima mi iyo.Nana viyema ->>>>>>> 076f815090a9fd1b7decf4fc7e8c7c9547e76819 +\v 33 Wena wena awamekasa,usitae Anutu kamana omo piavuma luksavevikive, \v 34 ayaema kamana igeti eriakarake,piama kamanapa utae avorata ayaema napiwa utae awame kasanda. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 228c71b..da007b4 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Maki -======= -Makiye ->>>>>>> 076f815090a9fd1b7decf4fc7e8c7c9547e76819 +Maki \ No newline at end of file diff --git a/manifest.json b/manifest.json index 244cf55..5a7f409 100644 --- a/manifest.json +++ b/manifest.json @@ -36,7 +36,8 @@ ], "translators": [ "OVAVO LANGUAGE O1", - "OVAVO LANGUAGE 02" + "OVAVO LANGUAGE 02", + "wa" ], "finished_chunks": [ "01-01", @@ -76,8 +77,8 @@ "03-05", "03-07", "03-09", - "03-13", "03-11", + "03-13", "03-17", "03-20", "03-23", @@ -98,6 +99,7 @@ "04-24", "04-26", "04-30", + "04-33", "04-35", "04-38", "05-title", @@ -111,14 +113,18 @@ "05-16", "05-18", "05-21", + "09-title", + "09-01", "09-04", "09-07", "09-09", "09-11", - "09-01", "09-14", "09-17", "09-20", + "09-23", + "09-26", + "09-28", "09-30", "09-33", "09-36", @@ -127,9 +133,8 @@ "09-42", "09-45", "09-47", - "09-title", - "10-title", "09-49", + "10-title", "10-01", "10-05", "10-07", @@ -152,9 +157,6 @@ "11-01", "11-04", "11-07", - "09-23", - "09-26", - "09-28", "11-11", "11-13", "11-15", @@ -166,12 +168,13 @@ "11-29", "11-31", "12-title", - "13-title", "12-01", "12-04", "12-06", "12-08", "12-10", + "12-13", + "13-title", "13-01", "13-03", "13-05", @@ -195,7 +198,6 @@ "16-12", "16-14", "16-17", - "16-19", - "12-13" + "16-19" ] } \ No newline at end of file