I need more coffee when merging

This commit is contained in:
Michael Friedrich 2019-10-25 09:54:23 +02:00
parent 3794049eba
commit 0a999f4c83
1 changed files with 0 additions and 4 deletions

View File

@ -97,11 +97,7 @@ License: GPLv2+
%endif # suse %endif # suse
Group: System/Monitoring Group: System/Monitoring
Name: icinga2 Name: icinga2
<<<<<<< HEAD
Version: 2.11.0
=======
Version: 2.11.2 Version: 2.11.2
>>>>>>> 2.11
Release: %{revision}%{?dist} Release: %{revision}%{?dist}
Url: https://www.icinga.com/ Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz