Fri Feb 15 2019 14:54:39 GMT+1100 (AUS Eastern Daylight Time)

2019-02-15 14:54:40 +11:00 · 2019-02-15 14:54:40 +11:00 · d5dbd6f55c
parent cfff698fe5
commit d5dbd6f55c
2 changed files with 2 additions and 10 deletions
--- a/01/title.txt
+++ b/01/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Sapta 1
-=======
-Ilal 1
->>>>>>> c94126e8d8dc2f5aada2a103590b325bd441f45a
+Sapta 1
--- a/front/title.txt
+++ b/front/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Mak
-=======
-Mak irlal gorete
->>>>>>> c94126e8d8dc2f5aada2a103590b325bd441f45a
+Mak