fix: merge conflict

Author: obycode

testnet/stacks-node/src/event_dispatcher.rs

@@ -92,7 +92,7 @@ pub struct EventObserver {
     pub timeout: Duration,
     /// If true, the stacks-node will not retry if event delivery fails for any reason.
     /// WARNING: This should not be set on observers that require successful delivery of all events.
-    disable_retries: bool,
+    pub disable_retries: bool,
 }
 
 struct ReceiptPayloadInfo<'a> {

testnet/stacks-node/src/tests/signer/v0.rs

@@ -1518,6 +1518,7 @@ fn regr_use_block_header_pk() {
             endpoint,
             db_path: None,
             timeout: Duration::from_secs(120),
+            disable_retries: false,
         })
         .collect();