Tue Mar 06 2018 22:27:01 GMT+0200 (South Africa Standard Time)

2018-03-06 22:27:02 +02:00 · 2018-03-06 22:27:02 +02:00 · fd86a4fd6a
parent 9338430e00
commit fd86a4fd6a
1 changed files with 1 additions and 5 deletions
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-1 Batheselonika
-=======
-1 BATHESALONIKA
->>>>>>> da3528fe0925e6e5826c0ec73e48d66c72a6544c
+1 Batheselonika