shell config change

0747b182 · 张思远 · 54efa98a · 0747b182 · 0747b182
Commit 0747b182 authored Dec 21, 2023 by 张思远
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 4 deletions

config.toml config.toml +1 -1

test.txt test.txt +0 -3

No files found.
--- a/config.toml
+++ b/config.toml
@@ -13,6 +13,6 @@ shutdown_timeout = 0
  token_obtained_at = 2023-12-20T09:23:38Z
  token_expires_at = 0001-01-01T00:00:00Z
  executor = "shell"
-  shell = "pwsh"
+  shell = "powershell"
  [runners.cache]
    MaxUploadedArchiveSize = 0
--- a/test.txt
+++ b/test.txt
 git pull test success
 test runner
 test piplelines
-<<<<<<< HEAD
 runer test
-=======
 test runner tags
->>>>>>> 0eb75f7f9bbda142f21dbf959f2f34994b023be9