Mon Mar 05 2018 22:10:50 GMT-0400 (SA Western Standard Time)

2018-03-05 22:10:51 -04:00 · 2018-03-05 22:10:51 -04:00 · 5005afe7cc
parent b3bc9b763b
commit 5005afe7cc
2 changed files with 2 additions and 5 deletions
--- a/04/title.txt
+++ b/04/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Capítulo 4
-=======
-capitulo cuatro
->>>>>>> 0693abf15f454379c63e6c0ddcd549e52ae38070
+Capítulo 4
--- a/manifest.json
+++ b/manifest.json
@ -71,6 +71,7 @@
 		"02-36",
 		"03-title",
 		"03-01",
+		"03-03",
 		"03-05",
 		"03-08",
 		"03-11",