From 4380fb9a6c25dd5198c4f201df76b99df303b6a5 Mon Sep 17 00:00:00 2001 From: felix_sichies Date: Fri, 31 Jul 2020 21:00:21 +0200 Subject: [PATCH] Fri Jul 31 2020 21:00:21 GMT+0200 (South Africa Standard Time) --- 03/21.txt | 6 +----- manifest.json | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/03/21.txt b/03/21.txt index 6da9b45..29b70bf 100644 --- a/03/21.txt +++ b/03/21.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 21 Onse uukacimfya nkamupela insambu shakwikala nandibo pa cipuna candi icabufumu, pamo ngefyo nandibo nacimfishe nokwikala pamo natata pacipuna icabufumu. \v 22 Uukwekete ukutwi omfwe ifyo umupashi ukososa kunkuta." -======= -\v 21 \v 22 Onse uukacimfya nkamupela insambu shakwikala nandibo pa cipuna candi icabufumu, pamo ngefyo nandibo nacimfishe nokwikala pamo natata pacipuna icabufumu. uukwekete ukutwi omfwe ifyo umupashi ukososa kunkuta." ->>>>>>> 30ec743683b62ddec147b5542c169b5fa216cb2c +\v 21 Onse uukacimfya nkamupela insambu shakwikala nandibo pa cipuna candi icabufumu, pamo ngefyo nandibo nacimfishe nokwikala pamo natata pacipuna icabufumu. \v 22 uukwekete ukutwi omfwe ifyo umupashi ukososa kunkuta." \ No newline at end of file diff --git a/manifest.json b/manifest.json index f57280e..24f0565 100644 --- a/manifest.json +++ b/manifest.json @@ -72,6 +72,7 @@ "03-14", "03-17", "03-19", + "03-21", "04-title", "04-01", "04-04",