Remove merge artifact

diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index ef2b3197e42d5eb1bdbf19d3df3647cee8a473ab..8d734ddeba2fd42e533926e8f6dd5cfcec3ddd63 100644 (file)
--- a/src/src/dmarc.c
+++ b/src/src/dmarc.c
@@ -313,7 +313,6 @@ return DMARC_HIST_OK;
 }
 
 
->>>>>>> a378ff99d... CVE-2020-28007: Link attack in Exim's log directory
 /* dmarc_process adds the envelope sender address to the existing
 context (if any), retrieves the result, sets up expansion
 strings and evaluates the condition outcome. */