[pesign/el6] Gah, missed a merge failure.

[Peter Jones]

commit a2423541458950c957df80c94a95273b4a8ffcef
Author: Peter Jones <pjones at redhat.com>
Date:   Thu Oct 18 15:31:00 2012 -0400

    Gah, missed a merge failure.

 pesign.spec |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
---
diff --git a/pesign.spec b/pesign.spec
index 2379e5a..15b8aaa 100644
--- a/pesign.spec
+++ b/pesign.spec
@@ -2,7 +2,6 @@ Summary: Signing utility for UEFI binaries
 Name: pesign
 Version: 0.99
 Release: 6%{?dist}
->>>>>>> f18
 Group: Development/System
 License: GPLv2
 URL: https://github.com/vathpela/pesign