Skip to content

Commit 2331b0d

Browse files
committed
Remove accidental file add
1 parent ef212d0 commit 2331b0d

File tree

2 files changed

+8
-489
lines changed

2 files changed

+8
-489
lines changed

docs/configuring-environment-gke-a4x.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,19 @@ After the cluster toolkit blueprint has completed verify key configurations.
253253
```
254254
You should see the output similar to the following:
255255
```
256+
<<<<<<< HEAD
256257
NAME STATUS ROLES AGE VERSION
257258
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-0phl Ready <none> 11d v1.32.9-gke.1130000
258259
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-12dg Ready <none> 11d v1.32.9-gke.1130000
259260
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-4ncf Ready <none> 11d v1.32.9-gke.1130000
260261
gke-imo-glacier-peak-a4x-highgpu-4g-a-76a6f770-6t1h Ready <none> 11d v1.32.9-gke.1130000
262+
=======
263+
NAME STATUS ROLES AGE VERSION
264+
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-0phl Ready <none> 1d v1.32.9-gke.1130000
265+
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-12dg Ready <none> 1d v1.32.9-gke.1130000
266+
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-4ncf Ready <none> 1d v1.32.9-gke.1130000
267+
gke-glacier-peak-a4x-highgpu-4g-a-76a6f770-6t1h Ready <none> 1d v1.32.9-gke.1130000
268+
>>>>>>> 1b3d10a (Remove accidental file add)
261269
...
262270
```
263271

0 commit comments

Comments
 (0)