[krename: 2/2] Fixed conflict

[Radek Novacek]

commit 3b51aa1e5955be700f5baa057dab0771b1a37f1c
Merge: fa92247 38c721d
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Sep 30 15:57:28 2010 +0200

    Fixed conflict

 krename.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc krename.spec
index 1d5ab7c,c4babff..ea4d69b
--- a/krename.spec
+++ b/krename.spec
@@@ -82,9 -82,9 +82,12 @@@ gtk-update-icon-cache %{_datadir}/icons
  
  
  %changelog
 +* Thu Sep 30 2010 Radek Novacek <rnovacek at redhat.com> 4.0.5-1
 +- Update to 4.0.5
 +
+ * Wed Sep 29 2010 jkeating - 4.0.4-2
+ - Rebuilt for gcc bug 634757
+ 
  * Mon Sep 13 2010 Radek Novacek <rnovacek at redhat.com> - 4.0.4-1
  - Update to 4.0.4