summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
Diffstat (limited to 'packaging')
-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