Mon Jul 20 2020 11:14:41 GMT+0200 (South Africa Standard Time)

2020-07-20 11:14:43 +02:00 · 2020-07-20 11:14:43 +02:00 · 870aa08386
parent 7cd4dfd291
commit 870aa08386
1 changed files with 1 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Johane
-=======
-Johane umbhabhatisi
->>>>>>> 192c7ec6153eab78ae98e152bd2a4579e2a1487d
+Johane