From 0be66c2a9f9f103b8f40fa2219005e888c9f2c63 Mon Sep 17 00:00:00 2001 From: mitikiwostky Date: Thu, 5 Apr 2018 13:38:56 -0400 Subject: [PATCH] Thu Apr 05 2018 13:38:55 GMT-0400 (SA Western Standard Time) --- 01/01.txt | 2 +- front/title.txt | 6 +----- manifest.json | 3 ++- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/01/01.txt b/01/01.txt index d3746e3..f38d4ff 100644 --- a/01/01.txt +++ b/01/01.txt @@ -1 +1 @@ -2\v 1 lolSantiago, tu'uk Dios tyumpe meet wyintsen Jesucristo, ma tii mak matsk kajp yo'oyakxte yes tyaky. \v 2 tukexe milits jutkujk xwinma aytyej, miits muku'uk tëjkte KU miits kawinëmpyë ätsjpën xpä'ätej,\v 3 nijaw eepxej kumits myëk ixy mäwäjät mjantsxäwën jats tso mëk mtanët. \ No newline at end of file +\c 1 \v 1 lolSantiago, tu'uk Dios tyumpe meet wyintsen Jesucristo, ma tii mak matsk kajp yo'oyakxte yes tyaky. \v 2 tukexe milits jutkujk xwinma aytyej, miits muku'uk tëjkte KU miits kawinëmpyë ätsjpën xpä'ätej, \v 3 nijaw eepxej kumits myëk ixy mäwäjät mjantsxäwën jats tso mëk mtanët. \ No newline at end of file diff --git a/front/title.txt b/front/title.txt index 3ffe85c..392da18 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -SANTIAGO -======= -Santiago ->>>>>>> branch 'master' of git@git.door43.org:mitikiwostky/neq_jas_text_reg.git +SANTIAGO \ No newline at end of file diff --git a/manifest.json b/manifest.json index 459614d..fa98bfd 100644 --- a/manifest.json +++ b/manifest.json @@ -35,7 +35,8 @@ ], "translators": [ "dalila", - "santiago" + "santiago", + "Milady Díaz Cabello" ], "finished_chunks": [ "front-title",