solana-labs
diff --git a/‎Cargo.lock
Lines changed: 2 additions & 2 deletions b/‎Cargo.lock
Lines changed: 2 additions & 2 deletions
diff --git a/‎ci/do-audit.sh
Lines changed: 3 additions & 0 deletions b/‎ci/do-audit.sh
Lines changed: 3 additions & 0 deletions
diff --git a/‎programs/bpf/Cargo.lock
Lines changed: 2 additions & 2 deletions b/‎programs/bpf/Cargo.lock
Lines changed: 2 additions & 2 deletions
@@ -46,11 +46,14 @@ cargo_audit_ignores=(
   # https://github.com/paritytech/jsonrpc/issues/605
   --ignore RUSTSEC-2021-0079
 
+<<<<<<< HEAD
   # tar: Links in archive can create arbitrary directories
   #
   # Blocked on `tar` releasing safe upgrade
   # https://github.com/alexcrichton/tar-rs/issues/238
   --ignore RUSTSEC-2021-0080
 
+=======
+>>>>>>> 0c62a6fe3 (Resolve zeroize_derive audit warning by bumping version (#20182))
 )
 scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"
Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,14 @@ cargo_audit_ignores=(`
`46`	`46`	`# https://github.com/paritytech/jsonrpc/issues/605`
`47`	`47`	`--ignore RUSTSEC-2021-0079`
`48`	`48`
	`49`	`+<<<<<<< HEAD`
`49`	`50`	`# tar: Links in archive can create arbitrary directories`
`50`	`51`	`#`
`51`	`52`	# Blocked on `tar` releasing safe upgrade
`52`	`53`	`# https://github.com/alexcrichton/tar-rs/issues/238`
`53`	`54`	`--ignore RUSTSEC-2021-0080`
`54`	`55`
	`56`	`+=======`
	`57`	`+>>>>>>> 0c62a6fe3 (Resolve zeroize_derive audit warning by bumping version (#20182))`
`55`	`58`	`)`
`56`	`59`	`scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"`