From 70efa650081d70e9734ad90aa8016ff9995eb040 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Apr 29 2016 11:53:10 +0000
Subject: merge git branches and rebuild


---

diff --git a/vim.spec b/vim.spec
index 527fcd9..ff3a29d 100644
--- a/vim.spec
+++ b/vim.spec
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -773,6 +773,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Apr 29 2016 Karsten Hopp <karsten@redhat.com> - 7.4.1797-2
+- merge git branches and rebuild
+
 * Fri Apr 29 2016 Karsten Hopp <karsten@redhat.com> 7.4.1797-1
 - patchlevel 1797