pr revisions

Author: benmusson

action.ps1

@@ -85,6 +85,7 @@ function Get-GitHubReleaseAssets {
         }
     }
 
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
     if ($ReleaseTag -like 'latest') {
         $apiUrl = "https://api.github.com/repos/$repositoryOwner/$repositoryName/releases/latest"
@@ -98,6 +99,9 @@ function Get-GitHubReleaseAssets {
 
     $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
@@ -384,7 +388,10 @@ function Invoke-Action {
     $ahkPath = Install-AutoHotkey
     $ahk2exePath = Install-Ahk2Exe
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
+=======
 =======
+>>>>>>> Stashed changes
 
     [void](Install-BinMod -Ahk2ExePath $ahk2exePath)
 >>>>>>> Stashed changes