[cronie/f21: 1/2] Fix merge conflicts.

[Marcela Mašláňová]

commit 309cb53a02f840682b1d4541be736a8f6841f0da
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Thu Sep 18 11:03:21 2014 +0200

    Fix merge conflicts.

 cronie.spec |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/cronie.spec b/cronie.spec
index 29eb3f1..9902a1d 100644
--- a/cronie.spec
+++ b/cronie.spec
@@ -5,24 +5,12 @@
 
 Summary:   Cron daemon for executing programs at set times
 Name:      cronie
-<<<<<<< HEAD
-Version:   1.4.11
-Release:   9%{?dist}
-Patch0:    correct-env.patch
-Patch1:    unitfile-killprocess.patch
-Patch2:    cronie-1.4.11-kill_fd.patch
-=======
 Version:   1.4.12
 Release:   1%{?dist}
->>>>>>> master
 License:   MIT and BSD and ISC and GPLv2+
 Group:     System Environment/Base
 URL:       https://fedorahosted.org/cronie
 Source0:   https://fedorahosted.org/releases/c/r/cronie/%{name}-%{version}.tar.gz
-<<<<<<< HEAD
-Source1:   https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
-=======
->>>>>>> master
 Requires:  dailyjobs
 
 %if %{with selinux}
@@ -87,8 +75,6 @@ extra features.
 %prep
 %setup -q
 
-cp %{SOURCE1} .
-
 %build
 %configure \
 %if %{with pam}
@@ -182,11 +168,7 @@ exit 0
 %files
 %doc AUTHORS README ChangeLog
 %{!?_licensedir:%global license %%doc}
-<<<<<<< HEAD
-%license COPYING gpl-2.0.txt
-=======
 %license COPYING
->>>>>>> master
 %attr(755,root,root) %{_sbindir}/crond
 %attr(4755,root,root) %{_bindir}/crontab
 %{_mandir}/man8/crond.*
@@ -218,13 +200,10 @@ exit 0
 %attr(0644,root,root) %{_sysconfdir}/cron.d/dailyjobs
 
 %changelog
-<<<<<<< HEAD
-=======
 * Wed Sep 17 2014 Marcela Mašláňová <mmaslano at redhat.com> - 1.4.12-1
 - new release 1.4.12
 - remove gpl2 license, because it's part of upstream COPYING now
 
->>>>>>> master
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.11-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild