From 5f8e98705a035fa69225ee2d80376ff49d5a2daa Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Thu, 25 Jul 2019 17:13:23 -0700
Subject: [PATCH] Thu Jul 25 2019 17:13:15 GMT-0700 (Pacific Daylight Time)

---
 12/title.txt  | 6 +-----
 manifest.json | 1 +
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/12/title.txt b/12/title.txt
index d5b5edd..d4aff93 100644
--- a/12/title.txt
+++ b/12/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Mak sapta 12
-=======
-sapta 12
->>>>>>> 2722b8f0224048380360a3c809f2c812029a135c
+Sapta 12
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0343d37..4c44b78 100644
--- a/manifest.json
+++ b/manifest.json
@@ -240,6 +240,7 @@
 		"11-27",
 		"11-29",
 		"11-31",
+		"12-title",
 		"12-01",
 		"12-04",
 		"12-06",