From ae2210d8758620e9fa947b0b3b40e09f434e87ad Mon Sep 17 00:00:00 2001 From: Alfred Date: Fri, 26 Apr 2024 15:54:23 +0200 Subject: [PATCH] Fri Apr 26 2024 15:54:23 GMT+0200 (Central Africa Time) --- 07/13.txt | 6 +----- manifest.json | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/07/13.txt b/07/13.txt index 31fb795..7e3e160 100644 --- a/07/13.txt +++ b/07/13.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 13 Mejuva tjingee indo Noah no vanatje ve ovazandu,Shem,Ham na Japheth no mukazendu ua noah, no vakazendu ve tatu vo vanatje ve ovazandu puna vo, va hita mo tjitendeze. \v 14 Vahita puno vipuka vio mokutu avihe otja po mihoko viavio, no vitumba avihe otja po mihoko viavio, no vikunguzuke avihe mbi kunguzuka kombanda jehi otja ko mihoko viavio peke peke, no uzera auhe otja po mihoko uao, no muhoko auhe uo tjipuka tji tji no ovivava, -======= -\v 13 Mejuva tjinge ondo Noah no vanatje ve ovazandu,Shem,Ham,na Japheth,no mukaendu ua Noah,no vakaendu vetatu vo vanatje ve ovazandu pu navo,vahita motjitendeze. \v 14 Vahita puno ovipuka vio mokuti avihe otja pomuhoko uavio,no vitumbua avihe otja pomuhoko uavio,no vikokozoke avihe kombanda jehi otja komuhoko uavio peke peke,no uzera auhe otja pomuhoko uau,notjipukaatjihe tji tjino vivava. ->>>>>>> fe8d2bdf92345d4422400df86924a6b923858908 +\v 13 Mejuva tjingee indo Noah no vanatje ve ovazandu,Shem,Ham na Japheth no mukazendu ua noah, no vakazendu ve tatu vo vanatje ve ovazandu puna vo, va hita mo tjitendeze. \v 14 Vahita puno vipuka vio mokutu avihe otja po mihoko viavio, no vitumba avihe otja po mihoko viavio, no vikunguzuke avihe mbi kunguzuka kombanda jehi otja ko mihoko viavio peke peke, no uzera auhe otja po mihoko uao, no muhoko auhe uo tjipuka tji tji no ovivava, \ No newline at end of file diff --git a/manifest.json b/manifest.json index 1a263c0..b4368aa 100644 --- a/manifest.json +++ b/manifest.json @@ -80,6 +80,8 @@ "05-32", "07-title", "07-06", + "07-08", + "07-11", "10-title", "10-01", "10-02",