From 4ec275b5cd0012ef894ae46c13ce012fc316a11f Mon Sep 17 00:00:00 2001
From: Brooks Prumo <brooks@solana.com>
Date: Mon, 18 Oct 2021 15:41:38 -0500
Subject: [PATCH] fix bad merge

---
 ci/do-audit.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ci/do-audit.sh b/ci/do-audit.sh
index ecab290812..3356b3423f 100755
--- a/ci/do-audit.sh
+++ b/ci/do-audit.sh
@@ -45,8 +45,6 @@ cargo_audit_ignores=(
   # Blocked on jsonrpc removing dependency on unmaintained `websocket`
   # https://github.com/paritytech/jsonrpc/issues/605
   --ignore RUSTSEC-2021-0079
-<<<<<<< HEAD
-=======
 
   # chrono: Potential segfault in `localtime_r` invocations
   #
@@ -54,6 +52,5 @@ cargo_audit_ignores=(
   # https://github.com/chronotope/chrono/issues/499
   --ignore RUSTSEC-2020-0159
 
->>>>>>> 7baeb04f2 (Ignore RUSTSEC-2020-0159)
 )
 scripts/cargo-for-all-lock-files.sh stable audit "${cargo_audit_ignores[@]}"