fixup! Update generated files

vincepri · vincepri · commit 720aea42f098 · 2019-08-13T07:54:37.000-07:00
Signed-off-by: Vince Prignano &lt;vincepri@vmware.com&gt;
diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
@@ -619,14 +619,6 @@ func (in *MachineStatus) DeepCopyInto(out *MachineStatus) {
 		*out = make(MachineAddresses, len(*in))
 		copy(*out, *in)
 	}
-<<<<<<< HEAD
-=======
-	if in.Phase != nil {
-		in, out := &in.Phase, &out.Phase
-		*out = new(string)
-		**out = **in
-	}
->>>>>>> 14a1ed9a5... Migrate API types
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineStatus.

Original file line number	Diff line number	Diff line change
`@@ -619,14 +619,6 @@ func (in MachineStatus) DeepCopyInto(out MachineStatus) {`
`619`	`619`	`out = make(MachineAddresses, len(in))`
`620`	`620`	`copy(out, in)`
`621`	`621`	`}`
`622`		`-<<<<<<< HEAD`
`623`		`-=======`
`624`		`- if in.Phase != nil {`
`625`		`- in, out := &in.Phase, &out.Phase`
`626`		`- *out = new(string)`
`627`		`- out = in`
`628`		`- }`
`629`		`->>>>>>> 14a1ed9a5... Migrate API types`
`630`	`622`	`}`
`631`	`623`
`632`	`624`	`// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MachineStatus.`