Fix bad merge

6 years ago · 77d72896f8
parent af63d55c08
commit 77d72896f8
1 changed files with 0 additions and 4 deletions
--- 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+