Skip to content

Commit

Permalink
Removing old merge markers
Browse files Browse the repository at this point in the history
  • Loading branch information
scooley authored Oct 25, 2016
1 parent 0b0a7c9 commit 0e2bde6
Showing 1 changed file with 1 addition and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -682,15 +682,12 @@ Function End-Stage {
$Script:ScriptStartTime = Get-Date
Log-Message -Message "Starting script"

<<<<<<< HEAD
If (-Not (Get-WindowsOptionalFeature -FeatureName Microsoft-Hyper-V -Online))
{
Log-Message -Message "Hyper-V has to be enabled" -MessageType Error
throw "Hyper-V not found"
}

=======
>>>>>>> upstream/master
#######################################################################################
# Explicit cleanup
#######################################################################################
Expand All @@ -714,15 +711,12 @@ If (($Cleanup -eq "Baseimages") -or ($Cleanup -eq "Everything"))
# Preparation of base VHDXs
#######################################################################################

<<<<<<< HEAD
If (-Not (Test-Path $Script:basePath))
{
Log-Message -Message "[Prepare] Creating base path"
New-Item -Path $Script:basePath -ItemType Directory -Force
}

=======
>>>>>>> upstream/master
$Script:installWimPath = Join-Path $Script:sourceMediaPath -ChildPath "sources\Install.wim"

If (Test-Path $Script:sourceUpdatePath) {
Expand Down Expand Up @@ -1596,4 +1590,4 @@ If ($Script:stage -eq 5 -and $Script:stage -lt $StopBeforeStage)
}
}

Log-Message -Message "Script finished - Total Duration: $(((Get-Date) - $Script:ScriptStartTime))"
Log-Message -Message "Script finished - Total Duration: $(((Get-Date) - $Script:ScriptStartTime))"

0 comments on commit 0e2bde6

Please sign in to comment.