Ignore conflicted error

tqa236 · tqa236 · commit a4b5563d46ab · 2024-03-07T21:06:10.000+01:00
diff --git a/scripts/validate_docstrings.py b/scripts/validate_docstrings.py
@@ -193,7 +193,7 @@ def validate_pep8(self):
                 "flake8",
                 "--format=%(row)d\t%(col)d\t%(code)s\t%(text)s",
                 "--max-line-length=88",
-                "--ignore=E203,E3,W503,W504,E402,E731,E128,E124",
+                "--ignore=E203,E3,W503,W504,E402,E731,E128,E124,E704",
                 file.name,
             ]
             response = subprocess.run(cmd, capture_output=True, check=False, text=True)

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ def validate_pep8(self):`
`193`	`193`	`"flake8",`
`194`	`194`	`"--format=%(row)d\t%(col)d\t%(code)s\t%(text)s",`
`195`	`195`	`"--max-line-length=88",`
`196`		`- "--ignore=E203,E3,W503,W504,E402,E731,E128,E124",`
	`196`	`+ "--ignore=E203,E3,W503,W504,E402,E731,E128,E124,E704",`
`197`	`197`	`file.name,`
`198`	`198`	`]`
`199`	`199`	`response = subprocess.run(cmd, capture_output=True, check=False, text=True)`