From e229b91b6fe5717b555032d6adfbb421a64d1b42 Mon Sep 17 00:00:00 2001
From: michael_rodriguez <michael_rodriguez@wycliffeassociates.org>
Date: Thu, 22 Apr 2021 17:28:29 -0400
Subject: [PATCH] Thu Apr 22 2021 17:28:29 GMT-0400 (Eastern Daylight Time)

---
 04/07.txt     | 6 +-----
 manifest.json | 9 ++++++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/04/07.txt b/04/07.txt
index bb90934f..8ffd6627 100644
--- a/04/07.txt
+++ b/04/07.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 8 \v 7
-=======
-\v 7 Te sbabial te chambalume jich yilel  te bit'il leon-choje, ta xchebal te bila kuxule jich yilel te b'it'il alal wakaxe, ta yoxebal te bila kuxule jich yich'obey sit yelaw te bit'il te winike te xchanebal te chambalame jich yilel te bit'il xike. \v 8 Ta xchanebal te chambalametik te kuxatike ta jujun kojt' ay wakeb xik'ik, te nojel ta sitiletik ta spat sok ta yutil te xik'ik. Ta k'aal sok ta ajk'ubal ma xkejch'ajik ta yalel in to: ''CH'ULTESBIL, CH'ULTESBIL, CH'ULTESBIL, JA'AT TE KAJWALTIK DIOS, TE SPISIL YA XU' AWU'UNE, ja te ay ta sneelal, ay ta ora in to sok te mach'a ya xtale.''
->>>>>>> eee1fea9153d3d5d04ff16044a0b70863ef40a23
+\v 7 Te sbabial te chambalume jich yilel  te bit'il leon-choje, ta xchebal te bila kuxule jich yilel te b'it'il alal wakaxe, ta yoxebal te bila kuxule jich yich'obey sit yelaw te bit'il te winike te xchanebal te chambalame jich yilel te bit'il xike. \v 8 Ta xchanebal te chambalametik te kuxatike ta jujun kojt' ay wakeb xik'ik, te nojel ta sitiletik ta spat sok ta yutil te xik'ik. Ta k'aal sok ta ajk'ubal ma xkejch'ajik ta yalel in to: ''CH'ULTESBIL, CH'ULTESBIL, CH'ULTESBIL, JA'AT TE KAJWALTIK DIOS, TE SPISIL YA XU' AWU'UNE, ja te ay ta sneelal, ay ta ora in to sok te mach'a ya xtale.''
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 52b4a91b..d3e29fe2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -81,6 +81,11 @@
 		"03-19",
 		"03-21",
 		"04-title",
+		"04-01",
+		"04-04",
+		"04-06",
+		"04-07",
+		"04-09",
 		"05-title",
 		"05-01",
 		"05-03",
@@ -253,8 +258,6 @@
 		"22-16",
 		"22-17",
 		"22-18",
-		"22-20",
-		"04-09",
-		"04-06"
+		"22-20"
 	]
 }
\ No newline at end of file