Wed Apr 10 2024 16:19:47 GMT+0300 (East Africa Time)

2024-04-10 16:19:48 +03:00 · 2024-04-10 16:19:48 +03:00 · b9889449cc
parent 667ef0138b
commit b9889449cc
2 changed files with 2 additions and 10 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Usambi 1
-=======
-Usambi wa 1
->>>>>>> 54b48c9bc27db87fc712f87a85f5ade2edc57788
+Usambi 1
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Luke
-=======
-Luka
->>>>>>> 54b48c9bc27db87fc712f87a85f5ade2edc57788
+Luka