zig

commit 73a306e2fa11c146b5f79a41953e0d19a82f17a5 (tree)
parent 7ee1b880427909fb53eef8d5f57e6349ecef9fcb
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Sat,  3 Mar 2018 17:44:41 -0500

fix conflict artifact accidentally in appveyor script

Diffstat:
M
ci/appveyor/build_script.bat
 | 
1
-

1 file changed, 0 insertions(+), 1 deletion(-)
diff --git a/ci/appveyor/build_script.bat b/ci/appveyor/build_script.bat
@@ -17,7 +17,6 @@ SET "ZIGPREFIXPATH=%APPVEYOR_BUILD_FOLDER%\llvm+clang-6.0.0-win64-msvc-release"
 
 call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64
 call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
->>>>>>> origin/master
 
 mkdir %ZIGBUILDDIR%
 cd %ZIGBUILDDIR%