[gupnp-tools/f16] fix merge

[Peter Robinson]

commit c4a50a9a3cc41a953a9fba838bdb15077dda5fe4
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Mon Dec 12 12:21:54 2011 +0000

    fix merge

 gupnp-tools.spec |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/gupnp-tools.spec b/gupnp-tools.spec
index 62b9f1d..721c5eb 100644
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@ -1,11 +1,6 @@
 Name:          gupnp-tools
-<<<<<<< HEAD
-Version:       0.8.3
-Release:       3%{?dist}
-=======
 Version:       0.8.4
 Release:       1%{?dist}
->>>>>>> master
 Summary:       A collection of dev tools utilising GUPnP and GTK+
 
 Group:         System Environment/Libraries