Sun Jul 05 2020 17:48:42 GMT+0200 (SAST)

2020-07-05 17:48:42 +02:00 · 2020-07-05 17:48:42 +02:00 · def3ad2180
parent 42d0334527
commit def3ad2180
2 changed files with 2 additions and 10 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Sehluko 1
-=======
-Sehluko
->>>>>>> 833ddf07a16bc693341ac456fd07e9fc88da8427
+Sehluko 1
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Matewu
-=======
-Mathewu
->>>>>>> 833ddf07a16bc693341ac456fd07e9fc88da8427
+Matewu