Skip to content

Commit 7db4dbc

Browse files
committed
Missing md merge
1 parent 2331b0d commit 7db4dbc

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

docs/configuring-environment-gke-a4x.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,19 +253,11 @@ After the cluster toolkit blueprint has completed verify key configurations.
253253
```
254254
You should see the output similar to the following:
255255
```
256-
<<<<<<< HEAD
257-
NAME STATUS ROLES AGE VERSION
258-
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-0phl Ready <none> 11d v1.32.9-gke.1130000
259-
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-12dg Ready <none> 11d v1.32.9-gke.1130000
260-
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-4ncf Ready <none> 11d v1.32.9-gke.1130000
261-
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-6t1h Ready <none> 11d v1.32.9-gke.1130000
262-
=======
263256
NAME STATUS ROLES AGE VERSION
264257
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-0phl Ready <none> 1d v1.32.9-gke.1130000
265258
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-12dg Ready <none> 1d v1.32.9-gke.1130000
266259
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-4ncf Ready <none> 1d v1.32.9-gke.1130000
267260
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-6t1h Ready <none> 1d v1.32.9-gke.1130000
268-
>>>>>>> 1b3d10a (Remove accidental file add)
269261
...
270262
```
271263

0 commit comments

Comments
 (0)