fix merge conflicts

Cargo.toml

@@ -39,8 +39,6 @@ members = [
 resolver = "2"
 
 [profile.release]
-# Shutdown when panicking so we can see the error, specifically for the wallet
-panic = "abort"
 # By default, Rust will wrap an integer in release mode instead of throwing the overflow error
 # seen in debug mode. Panicking at this time is better than silently using the wrong value.
 overflow-checks = true

README.md

@@ -24,7 +24,7 @@ The recommended running versions of each network are:
 |-----------|----------------|
 | Stagenet  | 1.0.0-alpha.0a |
 | Nextnet   | 1.0.0-rc.8     |
-| Esmeralda | 1.0.0-pre.16   |
+| Esmeralda | 1.0.0-pre.17   |
 
 For more detail about versioning, see [Release Ideology](https://github.com/tari-project/tari/blob/development/docs/src/branching_releases.md).
 

applications/minotari_app_grpc/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["The Tari Development Community"]
 description = "This crate is to provide a single source for all cross application grpc files and conversions to and from tari::core"
 repository = "https://github.com/tari-project/tari"
 license = "BSD-3-Clause"
-version = "1.0.0-pre.16"
+version = "1.0.0-pre.17"
 edition = "2018"
 
 [dependencies]
@@ -31,7 +31,7 @@ tonic = { version = "0.9.2", features = ["tls"] }
 zeroize = "1"
 
 [build-dependencies]
-tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.16" }
+tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.17" }
 tonic-build = "0.8.4"
 
 [package.metadata.cargo-machete]

applications/minotari_app_utilities/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "minotari_app_utilities"
-version = "1.0.0-pre.16"
+version = "1.0.0-pre.17"
 authors = ["The Tari Development Community"]
 edition = "2018"
 license = "BSD-3-Clause"
@@ -26,7 +26,7 @@ tonic = "0.9.2"
 
 [build-dependencies]
 tari_common = { path = "../../common", features = ["build", "static-application-info"] }
-tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.16" }
+tari_features = { path = "../../common/tari_features", version = "1.0.0-pre.17" }
 
 [features]
 miner_input = ["minotari_app_grpc"]