Skip to content

Commit 27729a9

Browse files
author
Tim Bannister
committed
Fix a bad merge
1 parent ff6d646 commit 27729a9

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

Diff for: content/ko/docs/tasks/tools/install-kubectl-windows.md

+3-15
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ card:
4242
`kubectl` 체크섬 파일을 다운로드한다.
4343

4444
```powershell
45-
<<<<<<< HEAD
46-
curl -LO "https://dl.k8s.io/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl.exe.sha256"
47-
=======
48-
curl.exe -LO "https://dl.k8s.io/{{< param "fullversion" >}}/bin/windows/amd64/kubectl.exe.sha256"
49-
>>>>>>> e54c13c4a4 ([ko] Update outdated files in dev-1.26-ko.1 (M165-M173,M189-M196))
45+
curl.exe -LO "https://dl.k8s.io/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl.exe.sha256"
5046
```
5147

5248
`kubectl` 바이너리를 체크섬 파일을 통해 검증한다.
@@ -160,23 +156,15 @@ kubectl은 Bash, Zsh, Fish, 및 PowerShell에 대한 자동 완성 지원을 제
160156
1. 다음 명령으로 최신 릴리스를 다운로드한다.
161157

162158
```powershell
163-
<<<<<<< HEAD
164-
curl -LO "https://dl.k8s.io/release/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl-convert.exe"
165-
=======
166-
curl.exe -LO "https://dl.k8s.io/release/{{< param "fullversion" >}}/bin/windows/amd64/kubectl-convert.exe"
167-
>>>>>>> e54c13c4a4 ([ko] Update outdated files in dev-1.26-ko.1 (M165-M173,M189-M196))
159+
curl.exe -LO "https://dl.k8s.io/release/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl-convert.exe"
168160
```
169161

170162
1. 바이너리를 검증한다. (선택 사항)
171163

172164
`kubectl-convert` 체크섬(checksum) 파일을 다운로드한다.
173165

174166
```powershell
175-
<<<<<<< HEAD
176-
curl -LO "https://dl.k8s.io/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl-convert.exe.sha256"
177-
=======
178-
curl.exe -LO "https://dl.k8s.io/{{< param "fullversion" >}}/bin/windows/amd64/kubectl-convert.exe.sha256"
179-
>>>>>>> e54c13c4a4 ([ko] Update outdated files in dev-1.26-ko.1 (M165-M173,M189-M196))
167+
curl.exe -LO "https://dl.k8s.io/v{{< skew currentPatchVersion >}}/bin/windows/amd64/kubectl-convert.exe.sha256"
180168
```
181169

182170
`kubectl-convert` 바이너리를 체크섬 파일을 통해 검증한다.

0 commit comments

Comments
 (0)