Fri Jun 22 2018 03:59:32 GMT-0400 (Eastern Daylight Time)

2018-06-22 03:59:32 -04:00 · 2018-06-22 03:59:32 -04:00 · e6a9edfa00
parent 39306d99c8
commit e6a9edfa00
1 changed files with 1 additions and 5 deletions
--- a/04/title.txt
+++ b/04/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Anafim 4
-=======
-Maki 3 anafim
->>>>>>> 8e6c6587bdfec5875715d591f60e64b9c649c888
+Anafim 4