Sat Jun 17 2017 13:08:18 GMT-0600 (Mountain Daylight Time)

2017-06-17 13:08:19 -06:00 · 2017-06-17 13:08:19 -06:00 · a0a0ea9104
parent 6e978e4993
commit a0a0ea9104
1 changed files with 1 additions and 5 deletions
--- a/02/title.txt
+++ b/02/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Mateu 2
-=======
-Ikauhanyo 2
->>>>>>> 2f3ea4685169aa19be9783bc945df832669201be
+Ikauhanyo 2