diff --git a/01-essentials/04-merge-conflict/verify.ps1 b/01-essentials/04-merge-conflict/verify.ps1 index ee74797..b1b3e58 100644 --- a/01-essentials/04-merge-conflict/verify.ps1 +++ b/01-essentials/04-merge-conflict/verify.ps1 @@ -127,9 +127,6 @@ $addTimeoutMerged = $LASTEXITCODE -eq 0 git merge-base --is-ancestor add-debug main $addDebugMerged = $LASTEXITCODE -eq 0 -Write-Host Timeout merged? $addDebugMerged -Write-Host Debug merged? $addDebugMerged - if ($addTimeoutMerged) { Write-Pass "add-timeout branch has been merged" } else {