Thu Apr 18 2024 19:24:53 GMT+0200 (heure d’été d’Europe centrale)

2024-04-18 19:24:53 +02:00 · 2024-04-18 19:24:53 +02:00 · bd18e089d7
parent 71999b9965
commit bd18e089d7
2 changed files with 2 additions and 10 deletions
--- a/14/title.txt
+++ b/14/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Likpi 14
-=======
-Likpi
->>>>>>> e5239d50632e26d70d9a4e9628bad3b0ea06d482
+Likpi 14
--- a/16/title.txt
+++ b/16/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Likpi 16
-=======
-LIKPI 16
->>>>>>> dc234667cb196a374004a02bdbb190f79b2d06db
+Likpi 16