message: Fix a stale merge artifact
diff: @@ -353,13 +353,8 @@ pub(crate) fn generate_reactor_impl(def: &ReactorDefinition) -> TokenStream {
  fn dispatch_event(
  &mut self,
  - <<<<<<< HEAD
  effect_builder: crate::effect::EffectBuilder<Self::Event>,
  - rng: &mut dyn crate::types::CryptoRngCore,
  - =======
  - effect_builder: crate::reactor::EffectBuilder<Self::Event>,
  rng: &mut crate::NodeRng,
  - >>>>>>> upstream/master
  event: Self::Event,
  ) -> crate::effect::Effects<Self::Event> {
  match event {
  