Revolve conflicts

vmware-labs · Jan 23, 2024 · 2b2718d · 2b2718d
2 parents 7c63609 + b167558
commit 2b2718d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/cmd/dt/push/push.go b/cmd/dt/push/push.go
@@ -8,7 +8,10 @@ import (
 	"github.com/vmware-labs/distribution-tooling-for-helm/cmd/dt/config"
 	"github.com/vmware-labs/distribution-tooling-for-helm/internal/widgets"
 	"github.com/vmware-labs/distribution-tooling-for-helm/pkg/chartutils"
+<<<<<<< HEAD:cmd/dt/push/push.go
 	"github.com/vmware-labs/distribution-tooling-for-helm/pkg/log"
+=======
+>>>>>>> main:cmd/dt/push.go
 	"github.com/vmware-labs/distribution-tooling-for-helm/pkg/wrapping"
 )
 
@@ -17,7 +20,11 @@ func ChartImages(wrap wrapping.Wrap, imagesDir string, opts ...chartutils.Option
 	return pushImages(wrap, imagesDir, opts...)
 }
 
+<<<<<<< HEAD:cmd/dt/push/push.go
 func pushImages(wrap wrapping.Wrap, imagesDir string, opts ...chartutils.Option) error {
+=======
+func pushChartImages(wrap wrapping.Wrap, imagesDir string, opts ...chartutils.Option) error {
+>>>>>>> main:cmd/dt/push.go
 	lock, err := wrap.GetImagesLock()
 	if err != nil {
 		return fmt.Errorf("failed to load Images.lock: %v", err)