From c782be6be265ebdd288c554531913f153794d4c5 Mon Sep 17 00:00:00 2001
From: tsDesktop <you@example.com>
Date: Sun, 16 Feb 2020 03:43:28 +0800
Subject: [PATCH] Sun Feb 16 2020 03:43:17 GMT+0800 (China Standard Time)

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

diff --git a/22/title.txt b/22/title.txt
index bb7efb4..8c2cb54 100644
--- a/22/title.txt
+++ b/22/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-As-hah 22
-=======
-As-ha 22
->>>>>>> f0eacb0063cbfcb9ec5aa5dcefaf7e17b17e2d72
+As-hah 22
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index a1d527a..ec1edb5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -363,6 +363,8 @@
 		"21-42",
 		"21-43",
 		"21-45",
+		"22-title",
+		"22-01",
 		"22-04",
 		"22-05",
 		"22-08",