From 5ca04d237106ca3645364937d6c44fb17445fec1 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@redhat.com>
Date: Tue, 14 Jul 2015 22:11:09 +0200
Subject: [PATCH] Fix merge conflict

---
 realmd.spec | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/realmd.spec b/realmd.spec
index 5e895eb..f2bc67d 100644
--- a/realmd.spec
+++ b/realmd.spec
@@ -1,11 +1,6 @@
 Name:		realmd
-<<<<<<< HEAD
-Version:	0.16.0
-Release:	2%{?dist}
-=======
 Version:	0.16.1
 Release:	1%{?dist}
->>>>>>> 9fe4111... Updated to upstream 0.16.1
 Summary:	Kerberos realm enrollment service
 License:	LGPLv2+
 URL:		http://cgit.freedesktop.org/realmd/realmd/