actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-15 06:08:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

removed merge conflicts

Browse Source
This commit is contained in:
Dariy.Nurgaleev
2020-03-20 00:22:12 +07:00
parent 8875bb3585 0ddeb1ac4b
commit 98d3de4ca4
48 changed files with 513 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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