From 138827fb793fc950aa212e7c6fe7b58338390a4d Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Jun 10 2015 08:22:14 +0000
Subject: fix merge leftovers


---

diff --git a/vim.spec b/vim.spec
index 6b1b627..5c0761a 100644
--- a/vim.spec
+++ b/vim.spec
@@ -2230,7 +2230,6 @@ rm -rf %{buildroot}
 * Wed Jun 10 2015 Karsten Hopp <karsten@redhat.com> 7.4.737-1
 - patchlevel 737
 
-<<<<<<< HEAD
 * Thu May 14 2015 Karsten Hopp <karsten@redhat.com> 7.4.729-1
 - patchlevel 729