Fix merge conflict

This commit is contained in:
int3l 2020-09-16 23:41:43 +03:00 committed by GitHub
parent 4ef3f957e3
commit 6ab01430fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -107,7 +107,7 @@ def test_log_and_exit(cap_out, mock_store_dir):
with pytest.raises(SystemExit):
error_handler._log_and_exit(
'msg', 1, error_handler.FatalError('hai'), "I'm a stacktrace",
'msg', 1, error_handler.FatalError('hai'), tb,
)
printed = cap_out.get()