diff --git a/01/16.txt b/01/16.txt index 386bda7..3b6d351 100644 --- a/01/16.txt +++ b/01/16.txt @@ -1,9 +1 @@ -<<<<<<< HEAD -\v 16 Abosusa ingingila yayo nekwangekhatsi, akulahle eceleni kwelilati ngasemphumalanga, endzaweni yemlotsa. \v 17 Kumele ayihlephule ivuleke ngetimphiko tayo, kepha kumele angayehlukanisi ibe tinhlangotsi letimbili. Utobese umphristi uyishisa elatini, etinkhunini letisemlilweni. Kutawuba ngumnikelo loshisiwe, futsi itawenta liphunga lelimnandzi la Simakadze; kutawuba ngumnikelo lowentelwe kuye ngemlilo. -======= -<<<<<<< HEAD -\v 16 Kumele asuse sikikila sayo nalesikuphetse, asilahle eceleni kwasemphumalanga yelilathi, endzaweni yemisiti. \v 17 Aboyidzabula ayivule ngetimphiko tayo, kepha kumele angayihlukanisi tinhlangotsi letimbili. Bese umpristi utoyishisela elathini, etikwetinkhuni letivutsa umlilo. Kuyobangumhlatjelo loshisiwe, phindze lotawukhichita liphunga lelimnandzi kuSimakadze; kutobangumnikelo lowentelwe yena ngemlilo. -======= -\v 16 Abosusa ingingila yayo nekwangekhatsi, akulahle eceleni kwelilati ngasemphumalanga, endzaweni yemlotsa. \v 17 Kumele ayihlephule ivuleke ngetimphiko tayo, kepha kumele angayehlukanisi ibe tinhlangotsi letimbili. Utobese umphristi uyishisa elatini, etinkhunini letisemlilweni. Kutawuba ngumnikelo loshisiwe, futsi itawenta liphunga lelimnandzi la Simakadze; kutawuba ngumnikelo lowentelwe kuye ngemlilo. ->>>>>>> e123b5f59885c70374c202a56693d3b9714718ba ->>>>>>> 77469f4e61d45c4afd7406c0230f64f7af6a3ac2 +\v 16 Abosusa ingingila yayo nekwangekhatsi, akulahle eceleni kwelilati ngasemphumalanga, endzaweni yemlotsa. \v 17 Kumele ayihlephule ivuleke ngetimphiko tayo, kepha kumele angayehlukanisi ibe tinhlangotsi letimbili. Utobese umphristi uyishisa elatini, etinkhunini letisemlilweni. Kutawuba ngumnikelo loshisiwe, futsi itawenta liphunga lelimnandzi la Simakadze; kutawuba ngumnikelo lowentelwe kuye ngemlilo. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 19aa551..766c870 100644 --- a/manifest.json +++ b/manifest.json @@ -51,6 +51,7 @@ "01-10", "01-12", "01-14", + "01-16", "02-title", "02-01", "02-04",