PlateauMalagasy
/
skg_gal_text_reg
1
0
Fork 0
Files Issues Pull Requests Releases Wiki Activity See in Reader

Wed Jan 22 2020 12:27:31 GMT-0500 (Eastern Standard Time)

This commit is contained in:
tsDesktop 2020-01-22 12:27:32 -05:00
parent 748d2f9045
commit 8a3eed5320
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
03/01.txt
View File

@ -1,5 +1 @@
<<<<<<< HEAD
\v 1 Nao Galatiana Adala! Ia ro namoriky anareo? T'ambany masonareo teo mihintsy ro nagnatoroan'i Jesosy Kristy voafantsiky.\v 2 Zao avao ro teako hianara nareo:" Nandramby gny Fanahy tamin'gny asa gny lily sa tamin'gny finoa zay kasanareo nareo? \v 3 Nareo vasa adala toka? Nanomboky tamin'gny Fagnahy nareo, hiafara amin'gny nofo va?
=======
\v 1 \v 2 \v 3 R
>>>>>>> 1e9b3ca200cf2f6c8a8b91b1c11199c0891f5019
\c 3 \v 1 Nao Galatiana Adala! Ia ro namoriky anareo? T'ambany masonareo teo mihintsy ro nagnatoroan'i Jesosy Kristy voafantsiky. \v 2 Zao avao ro teako hianara nareo:" Nandramby gny Fanahy tamin'gny asa gny lily sa tamin'gny finoa zay kasanareo nareo? \v 3 Nareo vasa adala toka? Nanomboky tamin'gny Fagnahy nareo, hiafara amin'gny nofo va?

44
manifest.json
View File

@ -36,27 +36,10 @@
"MAD127",
"MAD128",
"MAD129",
"MAD130"
"MAD130",
"LAPTOP-H5E91POD"
],
"finished_chunks": [
"06-01",
"06-03",
"06-06",
"06-09",
"06-11",
"06-14",
"06-17",
"03-title",
"03-04",
"03-06",
"03-10",
"03-13",
"03-15",
"03-17",
"03-19",
"03-21",
"03-23",
"03-27",
"01-title",
"01-01",
"01-03",
@ -77,6 +60,18 @@
"02-15",
"02-17",
"02-20",
"03-title",
"03-01",
"03-04",
"03-06",
"03-10",
"03-13",
"03-15",
"03-17",
"03-19",
"03-21",
"03-23",
"03-27",
"05-title",
"05-01",
"05-03",
@ -85,8 +80,15 @@
"05-11",
"05-13",
"05-16",
"05-25",
"05-19",
"05-22",
"05-19"
"05-25",
"06-01",
"06-03",
"06-06",
"06-09",
"06-11",
"06-14",
"06-17"
]
}