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

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

diff --git a/01/title.txt b/01/title.txt
index df93c2a..92f325e 100644
--- a/01/title.txt
+++ b/01/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-As-hah1
-=======
-As-ha 1
->>>>>>> f0eacb0063cbfcb9ec5aa5dcefaf7e17b17e2d72
+As-hah1
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 160b08a..16c4bbe 100644
--- a/manifest.json
+++ b/manifest.json
@@ -44,6 +44,7 @@
 	],
 	"finished_chunks": [
 		"front-title",
+		"01-title",
 		"01-01",
 		"01-04",
 		"01-07",