bad commit

Author: benmusson

action.ps1

@@ -85,26 +85,9 @@ function Get-GitHubReleaseAssets {
         }
     }
 
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-    if ($ReleaseTag -like 'latest') {
-        $apiUrl = "https://api.github.com/repos/$repositoryOwner/$repositoryName/releases/latest"
-    } else {
-        $apiUrl = "https://api.github.com/repos/$repositoryOwner/$repositoryName/releases/tags/$ReleaseTag"
-    }
 
-    Show-Message "Getting release information..." $StyleAction
-    $headers = @{ "User-Agent" = "PowerShell-ahk2exe-action" }
-    if (![string]::IsNullOrEmpty($env:GitHubToken)) { $headers["Authorization"] = "token $env:GitHubToken" }
-    
-    $release = Invoke-RestMethod -Uri $apiUrl -Method Get -Headers $headers
-
-=======
-    $release = Get-GitHubReleaseInformation -Repository $Repository -ReleaseTag $ReleaseTag
->>>>>>> Stashed changes
-=======
     $release = Get-GitHubReleaseInformation -Repository $Repository -ReleaseTag $ReleaseTag
->>>>>>> Stashed changes
+    
     $assets = $release.assets
     if ($assets.Count -eq 0) { Throw "No assets found for release '$displayPath'" }
 
@@ -134,8 +117,6 @@ function Get-GitHubReleaseAssets {
     return $downloadFolder
 }
 
-<<<<<<< Updated upstream
-=======
 function Get-GitHubReleaseFile {
     param(
         [string]$Repository,
@@ -178,7 +159,6 @@ function Get-GitHubReleaseFile {
     return $downloadDestination
 }
 
->>>>>>> Stashed changes
 function Invoke-UnzipAllInPlace {
     param (
         [string]$FolderPath
@@ -259,8 +239,6 @@ function Install-Ahk2Exe {
     return $installPath
 }
 
-<<<<<<< Updated upstream
-=======
 function Install-BinMod {
     param (
         [string]$Ahk2ExePath
@@ -292,7 +270,6 @@ function Install-BinMod {
     return $installPath
 }
 
->>>>>>> Stashed changes
 function Install-UPX {
     param (
         [string]$Ahk2ExePath
@@ -387,14 +364,8 @@ function Invoke-Action {
 
     $ahkPath = Install-AutoHotkey
     $ahk2exePath = Install-Ahk2Exe
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
-=======
->>>>>>> Stashed changes
 
     [void](Install-BinMod -Ahk2ExePath $ahk2exePath)
->>>>>>> Stashed changes
 
     if ("$env:Compression" -eq "upx") {
         [void](Install-UPX -Ahk2ExePath $ahk2exePath)