From 6d42c04772c6cf17c9e2cbfabed09f020749b0cc Mon Sep 17 00:00:00 2001
From: "Dariy.Nurgaleev" <d.nurgaleev@trueengineering.ru>
Date: Fri, 20 Mar 2020 00:26:46 +0700
Subject: [PATCH] InstallHelpers has been reworled with new function

---
 images/win/scripts/ImageHelpers/InstallHelpers.ps1 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/images/win/scripts/ImageHelpers/InstallHelpers.ps1 b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
index 0f965f74..5ce11ded 100644
--- a/images/win/scripts/ImageHelpers/InstallHelpers.ps1
+++ b/images/win/scripts/ImageHelpers/InstallHelpers.ps1
@@ -161,7 +161,6 @@ Hashtable for service arguments
     }
 }
 
-<<<<<<< HEAD
 function Start-DownloadWithRetry
 {
     param (
@@ -202,8 +201,6 @@ function Start-DownloadWithRetry
 }
 
 
-=======
->>>>>>> upstream/master
 function Install-VsixExtension
 {
     Param
@@ -354,7 +351,3 @@ function Test-IsWin16
 {
     (Get-WinVersion) -match "2016"
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master