fix bad merge
This commit is contained in:
committed by
Michael Vines
parent
a6e6bc6dc0
commit
4ec275b5cd
@ -45,8 +45,6 @@ cargo_audit_ignores=(
|
|||||||
# Blocked on jsonrpc removing dependency on unmaintained `websocket`
|
# Blocked on jsonrpc removing dependency on unmaintained `websocket`
|
||||||
# https://github.com/paritytech/jsonrpc/issues/605
|
# https://github.com/paritytech/jsonrpc/issues/605
|
||||||
--ignore RUSTSEC-2021-0079
|
--ignore RUSTSEC-2021-0079
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
|
|
||||||
# chrono: Potential segfault in `localtime_r` invocations
|
# chrono: Potential segfault in `localtime_r` invocations
|
||||||
#
|
#
|
||||||
@ -54,6 +52,5 @@ cargo_audit_ignores=(
|
|||||||
# https://github.com/chronotope/chrono/issues/499
|
# https://github.com/chronotope/chrono/issues/499
|
||||||
--ignore RUSTSEC-2020-0159
|
--ignore RUSTSEC-2020-0159
|
||||||
|
|
||||||
>>>>>>> 7baeb04f2 (Ignore RUSTSEC-2020-0159)
|
|
||||||
)
|
)
|
||||||
scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"
|
scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"
|
||||||
|
Reference in New Issue
Block a user