Thu Jul 25 2019 17:13:15 GMT-0700 (Pacific Daylight Time)

2019-07-25 17:13:23 -07:00 · 2019-07-25 17:13:23 -07:00 · 5f8e98705a
parent 7b3496f6de
commit 5f8e98705a
2 changed files with 2 additions and 5 deletions
--- a/12/title.txt
+++ b/12/title.txt
@ -1,5 +1 @@
-<<<<<<< HEAD
-Mak sapta 12
-=======
-sapta 12
->>>>>>> 2722b8f0224048380360a3c809f2c812029a135c
+Sapta 12
--- a/manifest.json
+++ b/manifest.json
@ -240,6 +240,7 @@
 		"11-27",
 		"11-29",
 		"11-31",
+		"12-title",
 		"12-01",
 		"12-04",
 		"12-06",