From de300d968eef7741b6c65b0660654eddd30a6180 Mon Sep 17 00:00:00 2001 From: monchotech Date: Wed, 21 Oct 2020 21:26:26 -0400 Subject: [PATCH] Wed Oct 21 2020 21:26:26 GMT-0400 (SA Western Standard Time) --- 07/04.txt | 9 ++------- manifest.json | 1 + 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/07/04.txt b/07/04.txt index 8c735db..88011a5 100644 --- a/07/04.txt +++ b/07/04.txt @@ -1,7 +1,2 @@ -<<<<<<< HEAD -\v 4 \v 5 -======= -\v 4 Ta patil la yijktey jilel te lum yu'un Caldeos jich bajt'ta kuxinel ta Harán; le to tel bajt, patil k'alal laj te'state, te Dios la yik'tel ta bay jlumaltik, le te banti kuxinematik ta ora into. -\v 5 Mayuk la yak'bey xejt'uk te k'inal,. Mayuk, ni xujtuk te banti ya yak' te yakane. -Ja la sch'uun manchukme Abrahan mato ayuk snich'ana, TE JA YA YAK'BEY TE LUM K'INAL, YA YU'UNIN SOK YA YAK'BEY JILEL TE MACH'A PATIL YA XTAL YU'UNE. ->>>>>>> 7b3564d1c6eacf41cfe0e122e24d157b7b98e23f +\v 4 Ta patil la yijktey jilel te lum yu'un Caldeos jich bajt'ta kuxinel ta Harán; le to tel bajt, patil k'alal laj te'state, te Dios la yik'tel ta bay jlumaltik, le te banti kuxinematik ta ora into. \v 5 Mayuk la yak'bey xejt'uk te k'inal,. Mayuk, ni xujtuk te banti ya yak' te yakane. +Ja la sch'uun manchukme Abrahan mato ayuk snich'ana, TE JA YA YAK'BEY TE LUM K'INAL, YA YU'UNIN SOK YA YAK'BEY JILEL TE MACH'A PATIL YA XTAL YU'UNE. \ No newline at end of file diff --git a/manifest.json b/manifest.json index 97173fe..118fdba 100644 --- a/manifest.json +++ b/manifest.json @@ -133,6 +133,7 @@ "06-12", "07-title", "07-01", + "07-04", "07-06", "07-09", "07-11",