Fix bad merge
This commit is contained in:
parent
af63d55c08
commit
77d72896f8
|
@ -49,11 +49,7 @@
|
||||||
# Main package
|
# Main package
|
||||||
#==============================================================================
|
#==============================================================================
|
||||||
Name: lemonldap-ng
|
Name: lemonldap-ng
|
||||||
<<<<<<< HEAD
|
|
||||||
Version: 2.1.0
|
Version: 2.1.0
|
||||||
=======
|
|
||||||
Version: 2.0.5
|
|
||||||
>>>>>>> v2.0
|
|
||||||
Release: %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
|
Release: %{?pre_release:0.}1%{?pre_release:.%{pre_release}}%{?dist}
|
||||||
Summary: LemonLDAP-NG WebSSO
|
Summary: LemonLDAP-NG WebSSO
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
|
|
Loading…
Reference in New Issue
Block a user