diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2022-09-19 13:00:41 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2022-09-19 13:00:41 +0200 |
commit | 642438375e685403b4cd60b0c0e25b80dd5a813d (patch) | |
tree | 30731fd5cf99b96c545303c604ffd1f9a577fbe7 /appveyor.yml | |
parent | 5d46b358d31ff7f0a67b104ad4cffffa032b3b35 (diff) | |
parent | 471b19d2aa799cd73bded23379e864dd35bec2b6 (diff) | |
download | psutil-642438375e685403b4cd60b0c0e25b80dd5a813d.tar.gz |
resolve conflicts
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3c26939e..4bbd51ae 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,7 @@ matrix: environment: global: # SDK v7.0 MSVC Express 2008's SetEnv.cmd script will fail if the - # /E:ON and /V:ON options are not enabled in the batch script intepreter + # /E:ON and /V:ON options are not enabled in the batch script interpreter # See: http://stackoverflow.com/a/13751649/163740 WITH_COMPILER: "cmd /E:ON /V:ON /C .\\.ci\\appveyor\\run_with_compiler.cmd" PYTHONWARNINGS: always |