projects / toolchains / rpm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2512f76)
Argh. Take two on the crufty spec 91/2691/2 master accepted/trunk/20130122.014644 accepted/trunk/20130123.211548 submit/trunk/20130121.190135 submit/trunk/20130123.213924
authorGraydon, Tracy <tracy.graydon@intel.com>
Thu, 17 Jan 2013 20:40:22 +0000 (12:40 -0800)
committerGraydon, Tracy <tracy.graydon@intel.com>
Thu, 17 Jan 2013 20:40:22 +0000 (12:40 -0800)
packaging/rpm.spec patch | blob | history

diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index e5c37c8..dc3d903 100644 (file)
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -179,10 +179,7 @@ rm -f rpmdb/db.h
 %patch86 -p1
 %patch87 -p1 -b .msm
 %patch90 -p1
-<<<<<<< HEAD
 %patch100 -p1
-=======
->>>>>>> 6863478... fixed optflags and perl auto-dependencies
 
 
 rm -f m4/libtool.m4
Domain: SCM / Uncategorized;