actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-13 20:56:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

InstallHelpers has been reworled with new function

Browse Source
This commit is contained in:
Dariy.Nurgaleev
2020-03-20 00:26:46 +07:00
parent 98d3de4ca4
commit 6d42c04772
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
images/win/scripts/ImageHelpers/InstallHelpers.ps1
View File

@@ -161,7 +161,6 @@ Hashtable for service arguments
} }
} }
<<<<<<< HEAD
function Start-DownloadWithRetry function Start-DownloadWithRetry
{ {
param ( param (
@@ -202,8 +201,6 @@ function Start-DownloadWithRetry
} }
=======
>>>>>>> upstream/master
function Install-VsixExtension function Install-VsixExtension
{ {
Param Param
@@ -354,7 +351,3 @@ function Test-IsWin16
{ {
(Get-WinVersion) -match "2016" (Get-WinVersion) -match "2016"
} }
<<<<<<< HEAD
=======
>>>>>>> upstream/master