From c6827dfb43d180e4f8bb249ec4594ea01eb8ed17 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 10 Jul 2018 21:40:24 -0400
Subject: [PATCH] fix post merge

---
 Gopkg.lock      | 3 +--
 types/errors.go | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index a98a7c86a..a73a2009a 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -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
diff --git a/types/errors.go b/types/errors.go
index 0f37bbd6b..a106ee9bb 100644
--- 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