From 77d72896f8de7245fa315eb09381de5633bd0b82 Mon Sep 17 00:00:00 2001
From: Xavier Guimard <yadd@debian.org>
Date: Mon, 1 Jul 2019 20:25:44 +0200
Subject: [PATCH] Fix bad merge

---
 rpm/lemonldap-ng.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rpm/lemonldap-ng.spec b/rpm/lemonldap-ng.spec
index d8b4e79ad..c5c964352 100644
--- a/rpm/lemonldap-ng.spec
+++ b/rpm/lemonldap-ng.spec
@@ -49,11 +49,7 @@
 # Main package
 #==============================================================================
 Name:           lemonldap-ng
-<<<<<<< HEAD
 Version:        2.1.0
-=======
-Version:        2.0.5
->>>>>>> v2.0
 Release:        %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
 Summary:        LemonLDAP-NG WebSSO
 License:        GPLv2+