Removes deprecated --halt-on-known-validators-accounts-hash-mismatch …

…cli arg (#2154)

(cherry picked from commit 4f228f4)

# Conflicts:
#	validator/src/cli.rs

multinode-demo/validator.sh

@@ -164,9 +164,6 @@ while [[ -n $1 ]]; do
     elif [[ $1 = --known-validator ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 = --halt-on-known-validators-accounts-hash-mismatch ]]; then
-      args+=("$1")
-      shift
     elif [[ $1 = --max-genesis-archive-unpacked-size ]]; then
       args+=("$1" "$2")
       shift 2

validator/src/cli.rs

@@ -2027,6 +2027,7 @@ fn deprecated_arguments() -> Vec<DeprecatedArg> {
             .long("enable-quic-servers"),
         usage_warning: "The quic server is now enabled by default.",
     );
+<<<<<<< HEAD
     add_arg!(
         Arg::with_name("halt_on_known_validators_accounts_hash_mismatch")
             .alias("halt-on-trusted-validators-accounts-hash-mismatch")
@@ -2048,6 +2049,8 @@ fn deprecated_arguments() -> Vec<DeprecatedArg> {
              --snapshot-interval-slots will set the incremental snapshot interval. To set the \
              full snapshot interval, use --full-snapshot-interval-slots.",
         ));
+=======
+>>>>>>> 4f228f4c3c (Removes deprecated --halt-on-known-validators-accounts-hash-mismatch cli arg (#2154))
     add_arg!(Arg::with_name("minimal_rpc_api")
         .long("minimal-rpc-api")
         .takes_value(false)