Fix bad merge

This commit is contained in:
Xavier Guimard 2019-07-01 20:25:44 +02:00
parent af63d55c08
commit 77d72896f8

View File

@ -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+