From b3a0f1ea394f75abad5b9d80f1abab8d73d1dd8c Mon Sep 17 00:00:00 2001
From: obycode <brice@obycode.com>
Date: Fri, 26 Apr 2024 17:11:54 -0400
Subject: [PATCH] fix: resolve merge error

---
 stacks-signer/src/config.rs | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/stacks-signer/src/config.rs b/stacks-signer/src/config.rs
index 8d1e373f00d..567c61aa8cc 100644
--- a/stacks-signer/src/config.rs
+++ b/stacks-signer/src/config.rs
@@ -598,26 +598,6 @@ Public key: 03bc489f27da3701d9f9e577c88de5567cf4023111b7577042d55cde4d823a3505
 Network: testnet
 Database path: :memory:
 DKG transaction fee: 0.01 uSTX
-"#
-            )
-        );
-    }
-
-    #[test]
-    fn test_config_to_string() {
-        let config = GlobalConfig::load_from_file("./src/tests/conf/signer-0.toml").unwrap();
-        let config_str = config.config_to_log_string();
-        assert_eq!(
-            config_str,
-            format!(
-                r#"
-Stacks node host: 127.0.0.1:20443
-Signer endpoint: [::1]:30000
-Stacks address: ST3FPN8KBZ3YPBP0ZJGAAHTVFMQDTJCR5QPS7VTNJ
-Public key: 03bc489f27da3701d9f9e577c88de5567cf4023111b7577042d55cde4d823a3505
-Network: testnet
-Database path: :memory:
-DKG transaction fee: 0.01 uSTX
 "#
             )
         );