From 9df46a41c50ac7d9d5ae851a84f1c558e9054ae4 Mon Sep 17 00:00:00 2001
From: wendyc <wendyc@noreply.door43.org>
Date: Wed, 26 Jan 2022 16:33:34 -0400
Subject: [PATCH] Wed Jan 26 2022 16:33:34 GMT-0400 (Paraguay Standard Time)

---
 06/42.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/06/42.txt b/06/42.txt
index f471619..1e96c19 100644
--- a/06/42.txt
+++ b/06/42.txt
@@ -1,6 +1 @@
-<<<<<<< HEAD
-\v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmätsk kä'äk, më'te akxy. \v 44 Wäi'itë nimuwoxk mil maty ojts tsa'pka'ajky tkaytyë
-=======
-\v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmatokä'äk, më'te akxy.
-\v 44 Wai'itë nimuwoxk mil mat: ojts tsa'pka'ajky tkaytyë
->>>>>>> 9eec394c4984bc028022ebabd4e50b09e4054663
+\v 42 Nitukëye ojts kujxë kyäytyë. \v 43 Tyumpë tëjk tkonmuktë tsäpka'aky kay tyuk, ujts mäkmätsk kä'äk, më'te akxy. \v 44 Wäi'itë nimuwoxk mil maty ojts tsa'pka'ajky tkaytyë
\ No newline at end of file