From 901e9bb628085f98c34fad48616d2fa981538098 Mon Sep 17 00:00:00 2001
From: Titus <you@example.com>
Date: Thu, 5 Mar 2020 13:51:54 +1100
Subject: [PATCH] Thu Mar 05 2020 13:51:53 GMT+1100 (Central Pacific Standard
 Time)

---
 front/title.txt |  6 +---
 manifest.json   | 73 ++++++++++++++++++++++++++-----------------------
 2 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/front/title.txt b/front/title.txt
index 2ce5f56..cac078e 100644
--- a/front/title.txt
+++ b/front/title.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-Kalesia
-=======
-KALESIA
->>>>>>> 7bb037dd7599a9e62504c38cfcefb81f74e94750
+Kalesia
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0d54686..42f50a5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -40,34 +40,27 @@
 		"sie language impatap 1"
 	],
 	"finished_chunks": [
-		"02-title",
-		"05-title",
-		"05-01",
-		"05-03",
-		"05-05",
-		"05-09",
-		"05-11",
-		"05-13",
-		"05-16",
-		"05-19",
-		"05-22",
-		"06-title",
-		"06-01",
-		"06-03",
-		"06-06",
-		"06-09",
-		"06-11",
-		"06-14",
-		"06-17",
-		"01-03",
-		"01-21",
-		"01-18",
-		"01-11",
-		"01-15",
-		"01-13",
-		"01-08",
-		"01-06",
+		"front-title",
+		"01-title",
 		"01-01",
+		"01-03",
+		"01-06",
+		"01-08",
+		"01-11",
+		"01-13",
+		"01-15",
+		"01-18",
+		"01-21",
+		"02-title",
+		"02-01",
+		"02-03",
+		"02-06",
+		"02-09",
+		"02-11",
+		"02-13",
+		"02-15",
+		"02-17",
+		"02-20",
 		"04-title",
 		"04-01",
 		"04-03",
@@ -83,12 +76,24 @@
 		"04-26",
 		"04-28",
 		"04-30",
-		"front-title",
-		"02-01",
-		"02-06",
-		"02-11",
-		"02-15",
-		"02-17",
-		"02-20"
+		"05-title",
+		"05-01",
+		"05-03",
+		"05-05",
+		"05-09",
+		"05-11",
+		"05-13",
+		"05-16",
+		"05-19",
+		"05-22",
+		"05-25",
+		"06-title",
+		"06-01",
+		"06-03",
+		"06-06",
+		"06-09",
+		"06-11",
+		"06-14",
+		"06-17"
 	]
 }
\ No newline at end of file