diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-04-21 09:09:13 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2021-04-28 00:40:52 +0200 |
| commit | b7ee9ba69039aca48704decc1c13b2618a8d96bc (patch) | |
| tree | f0817b81e509bb4b9302bad85f3b1737ef7ac7d5 | |
| parent | fee1a06ec05e58e0cda8cf04f28240688736f945 (diff) | |
| download | exim4-b7ee9ba69039aca48704decc1c13b2618a8d96bc.tar.gz | |
Remove merge artifact
| -rw-r--r-- | src/src/dmarc.c | 1 |
1 files changed, 0 insertions, 1 deletions
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. */ |