From 7464ade6ae92161b479a33f5363b3cde58e4a278 Mon Sep 17 00:00:00 2001 From: "Sascha L. Teichmann" Date: Wed, 16 Aug 2023 20:29:25 +0200 Subject: [PATCH] Fix merge conflict oversight in doc. --- docs/csaf_checker.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/csaf_checker.md b/docs/csaf_checker.md index f253fccd..2a8a91ca 100644 --- a/docs/csaf_checker.md +++ b/docs/csaf_checker.md @@ -101,16 +101,11 @@ It is only allowed to specify one off them. All interval boundaries are inclusive. You can ignore certain advisories while checking by specifying a list -<<<<<<< HEAD -of regular expressions to match their URLs by using the `ignorepattern` option. -E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain the sub strings **white** or **red**. -======= of regular expressions to match their URLs by using the `ignorepattern` option. E.g. `-i='.*white.*' -i='*.red.*'` will ignore files which URLs contain -the sub strings **white** or **red**. ->>>>>>> main +the sub strings **white** or **red**. In the config file this has to be noted as: ``` ignorepattern = [".*white.*", ".*red.*"]