From 60cc994c714dbb28d1b00aaf19584231e5aa8e06 Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Thu, 17 Sep 2020 19:43:10 +0100 Subject: [PATCH] =?UTF-8?q?Thu=20Sep=2017=202020=2019:43:10=20GMT+0100=20(?= =?UTF-8?q?GMT=20(heure=20d=E2=80=99=C3=A9t=C3=A9))?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/title.txt | 6 +----- manifest.json | 7 ++++++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/front/title.txt b/front/title.txt index 7d96e6b..f55f42d 100644 --- a/front/title.txt +++ b/front/title.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -Yohana sanmina kapo -======= -́́ ->>>>>>> a29fc6c9ca2319cc11f37d5a5b4e5d0de63a0620 +Yohana sanmina kapo \ No newline at end of file diff --git a/manifest.json b/manifest.json index dc84968..27cf5bf 100644 --- a/manifest.json +++ b/manifest.json @@ -33,9 +33,14 @@ ], "parent_draft": {}, "translators": [ - "samoe" + "samoe", + "Wara" ], "finished_chunks": [ + "front-title", + "01-title", + "01-01", + "01-03", "02-01", "02-04", "02-07",