diff options
Diffstat (limited to 'testing/dkimproxy/dkimproxy.out.confd')
-rw-r--r-- | testing/dkimproxy/dkimproxy.out.confd | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/dkimproxy/dkimproxy.out.confd b/testing/dkimproxy/dkimproxy.out.confd index 570b0bc078..b30c4ee2df 100644 --- a/testing/dkimproxy/dkimproxy.out.confd +++ b/testing/dkimproxy/dkimproxy.out.confd @@ -1,3 +1,7 @@ +<<<<<<< HEAD +OPTS="" +======= #OPTS="" +>>>>>>> c372a61b6ea8710b50e09bc8e12e8dc58a2e7dfa CONFIGFILE="/etc/dkimproxy/dkimproxy_out.conf" PIDFILE="/var/run/dkimproxy_out.pid" |