From 5d016a51a3bbd021a6aea77eb730e66fc31ccd75 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Feb 16 2016 17:08:51 +0000
Subject: Clean up bad merge


---

diff --git a/krb5.spec b/krb5.spec
index 63202c3..624fecc 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -767,7 +767,6 @@ exit 0
 
 
 %changelog
-=======
 * Tue Feb 16 2016 Robbie Harwood <rharwood@redhat.com> - 1.14-21
 - Adjust dependency on crypto-polices to be just the file we want
 - Patch courtesy of lslebodn