[yum-commits] Branch 'yum-3_2_X' - yum.spec

[James Antill]

 yum.spec |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit f5f60da808275bd040fdd6be703c2eac09df55db
Author: James Antill <james at and.org>
Date:   Wed Jan 5 10:51:16 2011 -0500

    Really not a good idea to conflict with what you are providing.

diff --git a/yum.spec b/yum.spec
index e9282e0..4d2ad2f 100644
--- a/yum.spec
+++ b/yum.spec
@@ -20,7 +20,6 @@ Requires: yum-metadata-parser >= 1.1.0
 Requires: python-iniparse
 Requires: pygpgme
 Prereq: /sbin/chkconfig, /sbin/service, coreutils
-Conflicts: yum-skip-broken
 Conflicts: rpm >= 5-0
 # Zif is a re-implementation of yum in C, however:
 #