Mon May 09 2022 10:53:35 GMT+0200 (South Africa Standard Time)

2022-05-09 10:53:36 +02:00 · 2022-05-09 10:53:36 +02:00 · 1434447f48
parent e5ee66f295
commit 1434447f48
2 changed files with 2 additions and 10 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Kauhanyo tha 1
-=======
-KAUHANYO ZA 1
->>>>>>> ac0fede6f0a30ff2c1c3627b54de393363038b21
+Kauhanyo tha 1
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Maroma
-=======
-MAROMA
->>>>>>> ac0fede6f0a30ff2c1c3627b54de393363038b21
+MAROMA