From 28ff88a1edf2316c5b47991d9665330d3796fe5e Mon Sep 17 00:00:00 2001
From: iwilltry42 <iwilltry42@gmail.com>
Date: Tue, 6 Jul 2021 13:26:50 +0200
Subject: [PATCH] fix missing merge conflict resolutions

---
 go.mod             | 1 +
 go.sum             | 1 +
 pkg/client/node.go | 7 -------
 vendor/modules.txt | 3 +++
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index b0d20808..6893fcd8 100644
--- a/go.mod
+++ b/go.mod
@@ -30,6 +30,7 @@ require (
 	github.com/spf13/viper v1.8.1
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonschema v1.2.0
+	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect
 	golang.org/x/text v0.3.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0
diff --git a/go.sum b/go.sum
index 6f0cbba9..879f84b4 100644
--- a/go.sum
+++ b/go.sum
@@ -686,6 +686,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20171026204733-164713f0dfce/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
diff --git a/pkg/client/node.go b/pkg/client/node.go
index 21946798..aae7bc46 100644
--- a/pkg/client/node.go
+++ b/pkg/client/node.go
@@ -34,10 +34,7 @@ import (
 	"time"
 
 	copystruct "github.com/mitchellh/copystructure"
-<<<<<<< HEAD
 	"gopkg.in/yaml.v2"
-=======
->>>>>>> 9a18c3a3 ([FEATURE] add ability to add ports to an existing loadbalancer (#615))
 
 	"github.com/docker/go-connections/nat"
 	dockerunits "github.com/docker/go-units"
@@ -741,11 +738,7 @@ func NodeReplace(ctx context.Context, runtime runtimes.Runtime, old, new *k3d.No
 
 	// start new node
 	log.Infof("Starting new node %s...", new.Name)
-<<<<<<< HEAD
 	if err := NodeStart(ctx, runtime, new, k3d.NodeStartOpts{Wait: true, NodeHooks: new.HookActions}); err != nil {
-=======
-	if err := NodeStart(ctx, runtime, new, k3d.NodeStartOpts{Wait: true}); err != nil {
->>>>>>> 9a18c3a3 ([FEATURE] add ability to add ports to an existing loadbalancer (#615))
 		if err := NodeDelete(ctx, runtime, new, k3d.NodeDeleteOpts{SkipLBUpdate: true}); err != nil {
 			return fmt.Errorf("Failed to start new node. Also failed to rollback: %+v", err)
 		}
diff --git a/vendor/modules.txt b/vendor/modules.txt
index d499b5ef..54f233ab 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -233,6 +233,9 @@ golang.org/x/net/proxy
 # golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602
 golang.org/x/oauth2
 golang.org/x/oauth2/internal
+# golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
+## explicit
+golang.org/x/sync/errgroup
 # golang.org/x/sys v0.0.0-20210616094352-59db8d763f22
 ## explicit
 golang.org/x/sys/execabs