Fix merge conflict
This commit is contained in:
parent
a2126811ad
commit
5ca04d2371
@ -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/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user