diff --git a/validator_client/src/duties/mod.rs b/validator_client/src/duties/mod.rs index 569a99efa2..de08f6ce7f 100644 --- a/validator_client/src/duties/mod.rs +++ b/validator_client/src/duties/mod.rs @@ -51,11 +51,7 @@ impl DutiesManager { /// /// be a wall-clock (e.g., system time, remote server time, etc.). fn update(&self, epoch: Epoch) -> Result { -<<<<<<< HEAD let duties = self.beacon_node.request_duties(epoch, &self.signers)?; -======= - let duties = self.beacon_node.request_duties(epoch, &self.pubkeys)?; ->>>>>>> master { // If these duties were known, check to see if they're updates or identical. if let Some(known_duties) = self.duties_map.read()?.get(&epoch) {