Fri Jul 09 2021 18:38:15 GMT-0400 (Eastern Daylight Time)

This commit is contained in:
Michael A. Rodriguez 2021-07-09 18:38:15 -04:00
parent 9ec5804992
commit 9c29a08103
2 changed files with 4 additions and 5 deletions

View File

@ -1,5 +1 @@
<<<<<<< HEAD \v 8 echi kanilkuami kie sine suwibi. Ma kie tasi nirulsa echi Riosi chapiri, echi pi suwama. Ayenacho nirulsa raichili sinu nira, echi pi riwema re. Nirulsa machirrutami, ana pi simirma. \v 9 mapu tamo kala machi echi ví ruya tamuje. \v 10 mapu ri norinma ni karavera, mapu ne karka kara mina simirma
\v 8 echi kanilkuami kie sine suwibi. Ma kie tasi nirulsa echi Riosi chapiri, echi pi suwama. Ayenacho nirulsa raichili sinu nira, echi pi riwema re. Nirulsa machirrutami, ana pi simirma. \v 9 mapu tamo kala machi echi ví ruya tamuje. \v 10 mapu ri norinma ni karavera, mapu ne karka kara mina simirma
=======
\v 8 Echi kanilkuami kie sine suwibi. ma kie tasi nirulsa echi Riosi chapiri, echi pi suwama. Ayenacho nirulsa raichili sinu nira, echi pi riwema re.\v 9 Nirulsa machirrutami pi ta nira, ana pi simirma. mapu tamo kala machi echi ví ruya tamuje. \v 10 Mapu ri norinma ni karavera, mapu ne karka kara mina simirma
>>>>>>> d09272a2cee43b2f29d41cba60658e144384eb98

View File

@ -181,9 +181,12 @@
"12-21", "12-21",
"12-25", "12-25",
"12-28", "12-28",
"12-30",
"13-title", "13-title",
"13-01", "13-01",
"13-04", "13-04",
"13-08",
"13-11",
"14-title", "14-title",
"14-01", "14-01",
"14-05", "14-05",