fix post merge

cosmos · Jul 11, 2018 · c6827df · c6827df
1 parent e984b73
commit c6827df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/types/errors.go b/types/errors.go
@@ -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