resolve conflict.

This commit is contained in:
徐聪
2021-12-30 17:35:27 +08:00
20 changed files with 172 additions and 93 deletions

View File

@@ -70,16 +70,16 @@ const (
stepTypeRendezvous stepType = "rendezvous"
)
type TransactionType string
type transactionType string
const (
TransactionStart TransactionType = "start"
TransactionEnd TransactionType = "end"
transactionStart transactionType = "start"
transactionEnd transactionType = "end"
)
type Transaction struct {
Name string `json:"name" yaml:"name"`
Type TransactionType `json:"type" yaml:"type"`
Type transactionType `json:"type" yaml:"type"`
}
type Rendezvous struct {
Name string `json:"name" yaml:"name"` // required