From 64450bc08559a5cffe38fcc4b2e702274c84ef6a Mon Sep 17 00:00:00 2001 From: tsDesktop Date: Thu, 22 Aug 2019 16:53:13 -0700 Subject: [PATCH] Thu Aug 22 2019 16:53:12 GMT-0700 (Pacific Daylight Time) --- 02/01.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/02/01.txt b/02/01.txt index 527b74c..082fa9b 100644 --- a/02/01.txt +++ b/02/01.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 1 \v 2 Mohcna Yesusiva ena Kapannamu ivina, Esana vaindi nrase orauano rienda Yesusiva nrau- varina. Iyo va-ara nrase Oravano -======= -\v 1 Mmo hena ena Yesusiva Kapenamu'i vine. Hesana vaindi nrase ora vano riane Yesusiva nrau'i varina. \v 2 Iyo va'ara nrase ora vano nrinda kuairasinda siavao nrau ega'i heva'a iyo variva mmatava'a vaine. Yesusiva su'e kua hisa timmamminae. ->>>>>>> 410af7597a2193bc485c575f804142609ae18d30 +\c 2 \v 1 Mmo hena ena Yesusiva Kapenamu'i vine. Hesana vaindi nrase ora vano riane Yesusiva nrau'i varina. \v 2 Iyo va'ara nrase ora vano nrinda kuairasinda siavao nrau ega'i heva'a iyo variva mmatava'a vaine. Yesusiva su'e kua hisa timmamminae. \ No newline at end of file diff --git a/manifest.json b/manifest.json index e1ea6d6..6d2ab5a 100644 --- a/manifest.json +++ b/manifest.json @@ -61,6 +61,7 @@ "01-43", "01-45", "02-title", + "02-01", "02-03", "02-05", "02-08",