diff --git a/01/01.txt b/01/01.txt index 5f15ffb..521c631 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1,13 +1 @@ -<<<<<<< HEAD -<<<<<<< HEAD -<<<<<<< HEAD -\c 1 \v 1 \v 3 ocanaca gara icamake moisés ira ragatane ira tosoritsi , gara tosorintsi inibateri josés ira itomi num, ira imeraro ira itigomi ira \v 2 moisés icankeri: moisés, ira natomi aroge icamake. llamï, pomotyanakemaro, oka joraran,obiro ayge atagaysati, ira picaragabera timagantsi ,agera kebatsiguira ora nopaguëmira ora timagatsi israeri -======= -\c 1 \v 1 \v 2 \v 3 okanaka gara ikamake ira Moises iriro jitatsa matsiguenga ,i ->>>>>>> 6e51e14f62d8fdfe7137bcd3df5b0effd1fd896e -======= -\c 1 \v 1 \v 2 \v 3 okanaka gara ikamakeri moshe,ira itomi tosorintsi,aige inibateri ira josue ira itomi nun,aige ine ira itingomi ira moises,ikankeri..moshe,ira natingomi,ikamakeni.ya mega,pintinanema,pomont ->>>>>>> 77312f3314e799a0982be5a53c465576bad6886a -======= -\c 1 \v 1 ocanaca gara icamake moisés ira ragatane ira tosoritsi , gara tosorintsi inibateri josés ira itomi num, ira imeraro ira itigomi ira moisés icankeri: \v 2 moisés, ira natomi aroge icamake. llamï, pomotyanakemaro, oka joraran,obiro ayge atagaysati, ira picaragabera timagantsi ,agera kebatsiguira ora nopaguëmira ora timagatsi israeri. \v 3 naro pïmiro gata pinagëri ganta pinaticatagëri .ora nopagënira ironti pashi obiro, aisati nangatacakemiro gara nacatacacari Moises. ->>>>>>> cf95c3efb873d0def7178071b1af7492446bbfae +\c 1 \v 1 ocanaca gara icamake moisés ira ragatane ira tosoritsi , gara tosorintsi inibateri josés ira itomi num, ira imeraro ira itigomi ira moisés icankeri: \v 2 moisés, ira natomi aroge icamake. llamï, pomotyanakemaro, oka joraran,obiro ayge atagaysati, ira picaragabera timagantsi ,agera kebatsiguira ora nopaguëmira ora timagatsi israeri. \v 3 naro pïmiro gata pinagëri ganta pinaticatagëri .ora nopagënira ironti pashi obiro, aisati nangatacakemiro gara nacatacacari Moises. \ No newline at end of file diff --git a/manifest.json b/manifest.json index a449d45..ea6557a 100644 --- a/manifest.json +++ b/manifest.json @@ -40,12 +40,11 @@ "janny katerine Naco acencios" ], "finished_chunks": [ - "10-01", - "03-01", - "18-01", + "01-01", "01-04", "01-06", "01-08", + "03-01", "03-02", "03-05", "03-07", @@ -53,6 +52,7 @@ "03-12", "03-14", "03-17", + "10-01", "10-03", "10-05", "10-06", @@ -76,6 +76,7 @@ "10-38", "10-40", "10-42", + "18-01", "18-03", "18-05", "18-07",