summaryrefslogtreecommitdiff
path: root/packaging/rpm.spec
diff options
context:
space:
mode:
authorGraydon, Tracy <tracy.graydon@intel.com>2013-01-17 12:40:22 -0800
committerGraydon, Tracy <tracy.graydon@intel.com>2013-01-17 12:40:22 -0800
commit4491550176b76280519a0c6482b4bf29b013fe51 (patch)
tree840540c09d812e7d4f9bed9b6210db70b334f455 /packaging/rpm.spec
parent2512f764eb7163927f02cbaac952fae910970c89 (diff)
downloadrpm-4491550176b76280519a0c6482b4bf29b013fe51.tar.gz
rpm-4491550176b76280519a0c6482b4bf29b013fe51.tar.bz2
rpm-4491550176b76280519a0c6482b4bf29b013fe51.zip
Diffstat (limited to 'packaging/rpm.spec')
-rw-r--r--packaging/rpm.spec3
1 files changed, 0 insertions, 3 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index e5c37c8..dc3d903 100644
--- 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