From 4491550176b76280519a0c6482b4bf29b013fe51 Mon Sep 17 00:00:00 2001
From: "Graydon, Tracy" <tracy.graydon@intel.com>
Date: Thu, 17 Jan 2013 12:40:22 -0800
Subject: Argh. Take two on the crufty spec

---
 packaging/rpm.spec | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'packaging')

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
-- 
cgit v1.2.3