From b7ee9ba69039aca48704decc1c13b2618a8d96bc Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Wed, 21 Apr 2021 09:09:13 +0200
Subject: [PATCH] Remove merge artifact

---
 src/src/dmarc.c | 1 -
 1 file changed, 1 deletion(-)

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. */
-- 
2.30.2