From ab28055d3fb4449cdf9c390af0da4fac23625706 Mon Sep 17 00:00:00 2001
From: lversaw <you@example.com>
Date: Tue, 13 Jun 2017 04:50:21 -0600
Subject: [PATCH] Tue Jun 13 2017 04:50:20 GMT-0600 (Mountain Daylight Time)

---
 23/31.txt | 6 +-----
 23/34.txt | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/23/31.txt b/23/31.txt
index c4145a75..51fc3779 100644
--- a/23/31.txt
+++ b/23/31.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 31 Cwale valwi venkondo chiva kuteka intaero zavo: niva hinda Paulusi nikumu leta masiku kwa Antiporisi. \v 32 Izuva lichilila, vuungi vwa valwi benkondo nivasiya vantanti ve mbizi kuti vayende naye imi avo vene niva voola kuchivaka chisilelezwe. \v 33 Vatanti vembizi hava  sika mwa Sizeriya, niva leta iñolo kumuvusisi, niku tambika Paulusi kwali.
-=======
-\v 31 Linu masole babe chilili itaelo zabo: chiba hinda Paulusi niku muleta masiku kwa Antipatri. \v 32 Hezuba lichilila, bungi bwa masola chiba siya bakwame bechile hembelesa kuti bayende naye mi abo chibabola kwi zubo ikolete. \v 33 Imi bakwame bechile hembelesa chiba kasika kwa Sesarea nikukaha iñolo kumubusisi,  ni kuka tambika Paulusi kwali.
->>>>>>> 4e806176261f52c550904f629fff2d2f3fb47742
+\v 31 Cwale valwi venkondo chiva kuteka intaero zavo: niva hinda Paulusi nikumu leta masiku kwa Antiporisi. \v 32 Izuva lichilila, vuungi vwa valwi benkondo nivasiya vantanti ve mbizi kuti vayende naye imi avo vene niva voola kuchivaka chisilelezwe. \v 33 Vatanti vembizi hava  sika mwa Sizeriya, niva leta iñolo kumuvusisi, niku tambika Paulusi kwali.
\ No newline at end of file
diff --git a/23/34.txt b/23/34.txt
index 652f8312..92cb5e97 100644
--- a/23/34.txt
+++ b/23/34.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD
-\v 34 Muvusisi hamana kuvala iñolo, na vuuza kuti Paulusi uzwa muchikiliti nzi; he ziva kuti uzwa kwa Sisilia, \v 35 Nati, " Muni zuwe chokwizula vazekisi vako chiveza kunu," imi cha laera kuti a vikiwe mumuleneñi wa mubuso wa Heroda.
-=======
-\v 34 Linu mubusisi cha bala iñolo, imi cha buza kuti Paulusi uzwa ku chilalo nzi: linu chalituta kuti uzwa kwa Silisia, \v 35 chawamba kuti, '' kaniku zuwe nenza bakuzekisa hachibasika kunu.'' Linu cha laela kuti ahindwe abikwe mumu muleneñi mukando wa Heroda.
->>>>>>> 4e806176261f52c550904f629fff2d2f3fb47742
+\v 34 Muvusisi hamana kuvala iñolo, na vuuza kuti Paulusi uzwa muchikiliti nzi; he ziva kuti uzwa kwa Sisilia, \v 35 Nati, " Muni zuwe chokwizula vazekisi vako chiveza kunu," imi cha laera kuti a vikiwe mumuleneñi wa mubuso wa Heroda.
\ No newline at end of file