From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 21 Apr 2021 07:09:13 +0000 (+0200)
Subject: Remove merge artifact
X-Git-Tag: exim-4.94.1~4
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/b7ee9ba69039aca48704decc1c13b2618a8d96bc

Remove merge artifact
---

diff --git a/src/src/dmarc.c b/src/src/dmarc.c
index ef2b3197e..8d734ddeb 100644
--- 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. */