[mingw32-spice-protocol] fixup conflict

[Gerd Hoffmann]

commit a4a9fd6eea0bec0750be7122246bd7a6ba44dbc2
Author: Gerd Hoffmann <kraxel at redhat.com>
Date:   Tue Apr 26 14:08:00 2011 +0200

    fixup conflict

 mingw32-spice-protocol.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/mingw32-spice-protocol.spec b/mingw32-spice-protocol.spec
index 4774f39..2237fc6 100644
--- a/mingw32-spice-protocol.spec
+++ b/mingw32-spice-protocol.spec
@@ -5,13 +5,8 @@
 %global __find_provides %{_mingw32_findprovides}
 
 Name:           mingw32-spice-protocol
-<<<<<<< HEAD
-Version:        0.6.1
-Release:        2%{?dist}
-=======
 Version:        0.8.0
 Release:        1%{?dist}
->>>>>>> Update to version 0.8.0
 Summary:        Spice protocol header files
 Group:          Development/Libraries
 License:        BSD