fix post merge

This commit is contained in:
Ethan Buchman 2018-07-10 21:40:24 -04:00
parent e984b73b96
commit c6827dfb43
2 changed files with 5 additions and 3 deletions

3
Gopkg.lock generated
View File

@ -137,7 +137,6 @@
".",
"hcl/ast",
"hcl/parser",
"hcl/printer",
"hcl/scanner",
"hcl/strconv",
"hcl/token",
@ -508,6 +507,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "33d51b55781a1579d2fde1bba70077b49c5804862ea56c72136f013c8498e0c6"
inputs-digest = "37c54ed9bde68bad33be02f5e09b17a42397fb2fc9a10fa582e66b3852a99370"
solver-name = "gps-cdcl"
solver-version = 1

View File

@ -56,7 +56,10 @@ const (
CodeMemoTooLarge CodeType = 13
// CodespaceRoot is a codespace for error codes in this file only.
CodespaceRoot CodespaceType = 1
// Notice that 0 is an "unset" codespace, which can be overridden with
// Error.WithDefaultCodespace().
CodespaceUndefined CodespaceType = 0
CodespaceRoot CodespaceType = 1
// Maximum reservable codespace (2^16 - 1)
MaximumCodespace CodespaceType = 65535