resolve conflict
This commit is contained in:
parent
5a9558d0a3
commit
e6101621fc
@ -83,7 +83,6 @@ func TestPassing(t *testing.T) {
|
||||
if ok {
|
||||
t.Fatalf("create outgoing context")
|
||||
}
|
||||
_ = md
|
||||
|
||||
ctx = NewOutgoingContext(ctx, New(1))
|
||||
testCtx(ctx)
|
||||
|
@ -23,7 +23,7 @@ type EC2Metadata struct {
|
||||
ReservationID int `json:"reservation-id"`
|
||||
AMIID int `json:"ami-id"`
|
||||
AMILaunchIndex int `json:"ami-launch-index"`
|
||||
kernelID int `json:"kernel-id"`
|
||||
KernelID int `json:"kernel-id"`
|
||||
InstanceID int `json:"instance-id"`
|
||||
} `json:"meta-data"`
|
||||
} `json:"latest"`
|
||||
|
Loading…
x
Reference in New Issue
Block a user