From a1df67496577b2ab1296b76dc9de82bfdccab717 Mon Sep 17 00:00:00 2001
From: Dodji Seketeli <dodji@fedoraproject.org>
Date: Aug 01 2009 11:10:34 +0000
Subject: Properly resolve conflict


---

diff --git a/nemiver.spec b/nemiver.spec
index 1b49919..e060917 100644
--- a/nemiver.spec
+++ b/nemiver.spec
@@ -1,11 +1,6 @@
 Name:		nemiver
-<<<<<<< nemiver.spec
 Version:	0.7.1
 Release:	1%{?dist}
-=======
-Version:	0.7.0
-Release:	3%{?dist}
->>>>>>> 1.28
 Summary:	A GNOME C/C++ Debugger
 
 Group:		Development/Debuggers