diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-13 12:05:43 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-03-13 12:05:43 +0000 |
| commit | 94f5ecf44d8fb3b6ad1436c4058840a1d86ddc41 (patch) | |
| tree | 9197898dbc660729f6565eff6d62a145b2305858 /CMakeLists.txt | |
| parent | f7695e8a1ea8ea10de8ea276409f09d6cce1a766 (diff) | |
| download | rspamd-94f5ecf44d8fb3b6ad1436c4058840a1d86ddc41.tar.gz rspamd-94f5ecf44d8fb3b6ad1436c4058840a1d86ddc41.zip | |
Cleanup shit.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 0 insertions, 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 |