From d2031a29b62e52e4d8cd77f2625eb858cf1d4f20 Mon Sep 17 00:00:00 2001
From: iliana etaoin <iliana@oxide.computer>
Date: Tue, 14 May 2024 18:57:11 +0000
Subject: [PATCH] fix #5743 vs. #5751 semantic merge conflict

---
 nexus/reconfigurator/execution/src/sled_state.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nexus/reconfigurator/execution/src/sled_state.rs b/nexus/reconfigurator/execution/src/sled_state.rs
index aaa5b6bc26..fafc1c2e44 100644
--- a/nexus/reconfigurator/execution/src/sled_state.rs
+++ b/nexus/reconfigurator/execution/src/sled_state.rs
@@ -90,7 +90,7 @@ mod tests {
     async fn test_decommission_is_idempotent(
         cptestctx: &ControlPlaneTestContext,
     ) {
-        let nexus = &cptestctx.server.apictx().nexus;
+        let nexus = &cptestctx.server.server_context().nexus;
         let datastore = nexus.datastore();
         let opctx = OpContext::for_tests(
             cptestctx.logctx.log.clone(),