resolve conflicts

Signed-off-by: Xu Yang <xyang@ciq.com>
2024-01-28 19:52:10 -07:00
parent be3a5b38e2
commit 259c1780c5
1 changed files with 1 additions and 0 deletions
--- a/internal/app/wwctl/container/syncuser/main.go
+++ b/internal/app/wwctl/container/syncuser/main.go
@@ -5,6 +5,7 @@ import (
 	"os"

 	"github.com/spf13/cobra"
+	container_build "github.com/warewulf/warewulf/internal/pkg/api/container"
 	"github.com/warewulf/warewulf/internal/pkg/api/routes/wwapiv1"
 	"github.com/warewulf/warewulf/internal/pkg/container"
 	"github.com/warewulf/warewulf/internal/pkg/wwlog"