authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-03 17:44:41-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-03-03 17:44:41-05:00
log73a306e2fa11c146b5f79a41953e0d19a82f17a5
treefee84d9fec2dee098941087fa084dc3612707260
parent7ee1b880427909fb53eef8d5f57e6349ecef9fcb

fix conflict artifact accidentally in appveyor script

1 files changed, 0 insertions(+), 1 deletions(-)

ci/appveyor/build_script.bat-1
...@@ -17,7 +17,6 @@ SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-6.0.0-win64-msvc-release"...@@ -17,7 +17,6 @@ SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-6.0.0-win64-msvc-release"
1717
18call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x6418call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
19call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd6419call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
20>>>>>>> origin/master
2120
22mkdir %ZIGBUILDDIR%21mkdir %ZIGBUILDDIR%
23cd %ZIGBUILDDIR%22cd %ZIGBUILDDIR%