Cleanup shit.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8aba1a0e45d29639f56504a5ee1045bafe71ddf2..a330a5a20ac6e62017467f188b2f210a74052148 100644 (file)
--- 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