From aafbb1b956d1360070faaf3e1042d88dde3fbd65 Mon Sep 17 00:00:00 2001 From: Daveyd_Matthew Date: Wed, 15 Nov 2023 11:33:57 -0500 Subject: [PATCH] =?UTF-8?q?Wed=20Nov=2015=202023=2011:33:57=20GMT-0500=20(?= =?UTF-8?q?hora=20est=C3=A1ndar=20de=20Colombia)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 06/26.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/06/26.txt b/06/26.txt index ad0b2327..a504e268 100644 --- a/06/26.txt +++ b/06/26.txt @@ -1,5 +1 @@ -<<<<<<< HEAD -\v 26 Ẽwandamdauna mua iekhapuikhim: ''deeu chi wonanu chi phoboor Jericó wauban mag chaain khaiba aagau chi naam thuursimee obeerpuiyaagau chi eudeem meegau obeer jem ai''. \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jeb gaai khaujieeram. -======= -\v 26 Maimua Josueeu jaau jim mug khãai ee iek chagcharam iekha jim: ''deeu chi woun nau chi phobor Jericó wauban khaiba aagau. Chi chaai chi naam thʉrrsim ee mua jʉrr pui yaag gau chi chaai chi endeem meegau obeer jem ai''. \p \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jẽb gaai khau jieeram. ->>>>>>> f9d48844f7bc65e4d9e6455e360b1b268a5fbce5 +\v 26 Maimua Josueeu jaau jim mug khãai ee iek chagcharam iekha jim: ''deeu chi woun nau chi phobor Jericó wauban khaiba aagau. Chi chaai chi naam thʉrrsim ee mua jʉrr pui yaag gau chi chaai chi endeem meegau obeer jem ai''. \p \v 27 Mai chi Ẽwandam Josué dʉi sieejim mai ithʉn jẽb gaai khau jieeram. \ No newline at end of file