Fri Mar 20 2020 08:56:55 GMT+0100 (Paris, Madrid)

2020-03-20 08:56:56 +01:00 · 2020-03-20 08:56:56 +01:00 · f1ab092f6f
parent ff3c0b9533
commit f1ab092f6f
2 changed files with 2 additions and 10 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1
-=======
-́1
->>>>>>> ddf1978baaa142194aa5be06178715d396b95e1d
+1
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Kolosia tɔwo be woma
-=======
-Colosetɔwo be woma
->>>>>>> ddf1978baaa142194aa5be06178715d396b95e1d
+Colosetɔwo be woma