From 259c1780c5b582eace6f81565239d4fba4fe2aca Mon Sep 17 00:00:00 2001
From: Xu Yang <xyang@ciq.com>
Date: Sun, 28 Jan 2024 19:52:10 -0700
Subject: [PATCH] resolve conflicts

Signed-off-by: Xu Yang <xyang@ciq.com>
---
 internal/app/wwctl/container/syncuser/main.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/internal/app/wwctl/container/syncuser/main.go b/internal/app/wwctl/container/syncuser/main.go
index e6fa6727..67e2d296 100644
--- 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"