Fix proto.Merge of IntOrString type

This commit is contained in:
Jordan Liggitt 2019-10-15 11:20:50 -04:00
parent 245189b8a1
commit 2563c04158

View File

@ -45,7 +45,7 @@ type IntOrString struct {
}
// Type represents the stored type of IntOrString.
type Type int
type Type int64
const (
Int Type = iota // The IntOrString holds an int.