[yum/f14: 2/2] Fix merge conflict

[James Antill]

commit 0e3973dcf791f95ef11b86b359d940a453c1f22e
Merge: 5983bf4 bd5173d
Author: James Antill <james at and.org>
Date:   Wed May 11 11:06:14 2011 -0400

    Fix merge conflict

 yum.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --cc yum.spec
index 5bd77c3,cb485ea..24cb483
--- a/yum.spec
+++ b/yum.spec
@@@ -3,7 -3,7 +3,7 @@@
  Summary: RPM installer/updater
  Name: yum
  Version: 3.2.28
- Release: 4%{?dist}
 -Release: 5%{?dist}
++Release: 6%{?dist}
  License: GPLv2+
  Group: System Environment/Base
  Source0: http://yum.baseurl.org/download/3.2/%{name}-%{version}.tar.gz
@@@ -141,10 -136,10 +141,14 @@@ rm -rf $RPM_BUILD_ROO
  %dir /usr/lib/yum-plugins
  
  %changelog
- * Wed May 11 2011 James Antill <james at fedoraproject.org> - 3.2.28-5
++* Wed May 11 2011 James Antill <james at fedoraproject.org> - 3.2.28-6
 +- Update consolidate_libc to fix new version issue.
 +- Limit skip-broken to 30 loops, for rel-eng.
 +
+ * Tue Oct  5 2010 Seth Vidal <skvidal at fedoraproject.org> - 3.2.28-5
+ - bumping to 3.2.28-5 so f12 doesn't have a higher version
+ - bug # 640181
+ 
  * Tue Sep 14 2010 James Antill <james at fedoraproject.org> - 3.2.28-4
  - Fix auto-close bug with GPG key installs.
  - Resolves: bug#622179