[udis86/f19] Fix merge release conflict

[Scott Tsai]

commit 56177404d004dbace1b98e9387d1006652320e04
Author: Scott Tsai <scottt.tw at gmail.com>
Date:   Sat Jun 1 18:04:09 2013 +0800

    Fix merge release conflict

 udis86.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/udis86.spec b/udis86.spec
index e85d7a9..de54567 100644
--- a/udis86.spec
+++ b/udis86.spec
@@ -1,11 +1,6 @@
 Name:           udis86
-<<<<<<< HEAD
 Version:        1.7.1
 Release:        1%{?dist}
-=======
-Version:        1.7
-Release:        8.%{gitrev}%{?dist}
->>>>>>> 10ba363d2e2b88433862e9c5abdad237a21db917
 Summary:        A disassembler library for x86 and x86-64
 
 Group:          System Environment/Libraries