Resolve spec merge conflicts

Signed-off-by: Solomon Hykes <solomon@dagger.io>
2021-12-19 09:39:52 +00:00
parent 087b36b2a6
commit 7b7ee5455f
21 changed files with 463 additions and 303 deletions
--- a/europa-universe/docker/build.cue
+++ b/europa-universe/docker/build.cue
@@ -2,7 +2,7 @@ package docker

 import (
 	"dagger.io/dagger"
-	"dagger.io/dagger/engine/spec/engine"
+	"dagger.io/dagger/engine"
 )

 // Modular build API for Docker containers
--- a/europa-universe/docker/docker.cue
+++ b/europa-universe/docker/docker.cue
@@ -4,7 +4,7 @@ package docker
 import (
 	"list"

-	"dagger.io/dagger/engine/spec/engine"
+	"dagger.io/dagger/engine"
 	"dagger.io/dagger"
 )