From 56e46070814a01e5bc39893b9b463f07e4b8e464 Mon Sep 17 00:00:00 2001 From: pancsta <155631569+pancsta@users.noreply.github.com> Date: Mon, 15 Jan 2024 19:53:02 +0100 Subject: [PATCH] chore: format --- pkg/machine/misc.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/machine/misc.go b/pkg/machine/misc.go index bf3b503..cb52bf1 100644 --- a/pkg/machine/misc.go +++ b/pkg/machine/misc.go @@ -35,7 +35,15 @@ type Event struct { Name string Machine *Machine Args A +<<<<<<< HEAD step *TransitionStep +||||||| parent of 2632cdd (chore: format) + // internal events lack a step + step *TransitionStep +======= + // internal events lack a step + step *TransitionStep +>>>>>>> 2632cdd (chore: format) } type Opts struct { @@ -199,6 +207,7 @@ type ( indexWhen map[string][]*whenBinding // map of (single) state names to a list of bindings indexStateCtx map[string][]context.CancelFunc + indexEventCh map[string][]chan *Event ) type whenBinding struct {