summaryrefslogtreecommitdiffstats
path: root/testing/dkimproxy/dkimproxy.in.confd
diff options
context:
space:
mode:
Diffstat (limited to 'testing/dkimproxy/dkimproxy.in.confd')
-rw-r--r--testing/dkimproxy/dkimproxy.in.confd4
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/dkimproxy/dkimproxy.in.confd b/testing/dkimproxy/dkimproxy.in.confd
index e10508a436..96017f2022 100644
--- a/testing/dkimproxy/dkimproxy.in.confd
+++ b/testing/dkimproxy/dkimproxy.in.confd
@@ -1,3 +1,7 @@
+<<<<<<< HEAD
+OPTS=""
+=======
#OPTS=""
+>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa
CONFIGFILE="/etc/dkimproxy/dkimproxy_in.conf"
PIDFILE="/var/run/dkimproxy_in.pid"