From d517ff82e206a84a8368ae5b525d02b9a41d8ad8 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sun, 8 Dec 2019 13:40:01 -0500
Subject: [PATCH] Sun Dec 08 2019 13:40:00 GMT-0500 (Eastern Standard Time)

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

diff --git a/22/title.txt b/22/title.txt
index 482e41f..33bb1ef 100644
--- a/22/title.txt
+++ b/22/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Capitulo 22
-=======
-Chapter 22
->>>>>>> 4bccda3d87d3d52565b98d725d7a78f330a3cb80
+Capitulo 22
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index f57e5eb..09bcbd3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -362,6 +362,7 @@
 		"21-42",
 		"21-43",
 		"21-45",
+		"22-title",
 		"22-01",
 		"22-04",
 		"22-05",