Resolve spec merge conflicts

Signed-off-by: Solomon Hykes <solomon@dagger.io>
This commit is contained in:
Solomon Hykes
2021-12-19 09:39:52 +00:00
committed by Solomon Hykes
parent 087b36b2a6
commit 7b7ee5455f
21 changed files with 463 additions and 303 deletions

View File

@@ -14,7 +14,7 @@ import (
var (
// FS contains the filesystem of the stdlib.
//go:embed **/*.cue **/*/*.cue europa/dagger/*.cue europa/dagger/engine/*.cue europa/dagger/engine/spec/*.cue europa/dagger/engine/spec/engine/*.cue
//go:embed **/*.cue **/*/*.cue europa/dagger/*.cue europa/dagger/engine/*.cue
FS embed.FS
ModuleName = "alpha.dagger.io"