From d78dc88330af046003f928b7c7d92345d77e4a6f Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Jun 09 2014 13:07:36 +0000
Subject: add conflict with systemd-timesyncd service


---

diff --git a/chronyd.service b/chronyd.service
index 48ec1ee..3ed34c3 100644
--- a/chronyd.service
+++ b/chronyd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=NTP client/server
 After=ntpdate.service sntp.service ntpd.service
-Conflicts=ntpd.service
+Conflicts=ntpd.service systemd-timesyncd.service
 
 [Service]
 Type=forking