From 94f5ecf44d8fb3b6ad1436c4058840a1d86ddc41 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 13 Mar 2015 12:05:43 +0000
Subject: [PATCH] Cleanup shit.

---
 CMakeLists.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aba1a0e4..a330a5a20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1015,11 +1015,8 @@ SET(CONFFILES
 	conf/logging.conf
 	conf/metrics.conf
 	conf/modules.conf
-<<<<<<< HEAD
 	conf/options.conf
 	conf/rspamd.conf
-=======
->>>>>>> 317da93... Reiterate on systemd.
 	conf/statistic.conf
 	conf/workers.conf
 	conf/2tld.inc
-- 
2.39.5