Skip to content

Commit

Permalink
chore: format
Browse files Browse the repository at this point in the history
  • Loading branch information
pancsta committed Jan 15, 2024
1 parent 2960dc1 commit 56e4607
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions pkg/machine/misc.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@ type Event struct {
Name string
Machine *Machine
Args A
<<<<<<< HEAD

Check failure on line 38 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected <<, expected field name or embedded type

Check failure on line 38 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

expected '}', found '<<' (typecheck)

Check failure on line 38 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected <<, expected field name or embedded type

Check failure on line 38 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected <<, expected field name or embedded type
step *TransitionStep
||||||| parent of 2632cdd (chore: format)

Check failure on line 40 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ||, expected field name or embedded type

Check failure on line 40 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ||, expected field name or embedded type

Check failure on line 40 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ||, expected field name or embedded type
// internal events lack a step
step *TransitionStep
=======

Check failure on line 43 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ==, expected field name or embedded type

Check failure on line 43 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ==, expected field name or embedded type

Check failure on line 43 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected ==, expected field name or embedded type
// internal events lack a step
step *TransitionStep
>>>>>>> 2632cdd (chore: format)

Check failure on line 46 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected >>, expected field name or embedded type (typecheck)

Check failure on line 46 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected >>, expected field name or embedded type) (typecheck)

Check failure on line 46 in pkg/machine/misc.go

View workflow job for this annotation

GitHub Actions / build (1.21)

syntax error: unexpected >>, expected field name or embedded type
}

type Opts struct {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit 56e4607

Please sign in to comment.