From 3ea354e0c1902a83f4616e914d144776cbb1efc7 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Sep 13 2016 15:10:16 +0000
Subject: fix merge conflicts


---

diff --git a/vim.spec b/vim.spec
index 2c4d4f2..d95e5a1 100644
--- a/vim.spec
+++ b/vim.spec
@@ -747,6 +747,9 @@ rm -rf %{buildroot}
 * Tue Sep 13 2016 Karsten Hopp <karsten@redhat.com> 8.0.003-1
 - patchlevel 003
 
+* Wed Sep 07 2016 Karsten Hopp <karsten@redhat.com> 7.4.2342-1
+- patchlevel 2342
+
 * Mon Sep 05 2016 Karsten Hopp <karsten@redhat.com> 7.4.2330-1
 - patchlevel 2330