commit cc428bc2193abfef4275954505a8dbf229ca8f4c
author Peter Mounce <pete@neverrunwithscissors.com> Thu Nov 24 15:15:27 2016 +0000
committer Dmitry Lomov <dslomov@google.com> Thu Nov 24 15:55:09 2016 +0000
tree 95d4d2c17a794bb1c2a920ac2752eedbeb38bc62
parent b51a8cb05ae989815157d82ed86cfa3a6fbf53fc

Prevent merge debris being part of package



Closes #2095.

--
Reviewed-on: https://github.com/bazelbuild/bazel/pull/2095
MOS_MIGRATED_REVID=140134289

scripts/packages/chocolatey/build.ps1

diff --git a/scripts/packages/chocolatey/build.ps1 b/scripts/packages/chocolatey/build.ps1
index 0123d31..812047d 100644
--- a/scripts/packages/chocolatey/build.ps1
+++ b/scripts/packages/chocolatey/build.ps1
@@ -30,6 +30,7 @@
 rm -force -ErrorAction SilentlyContinue ./bazel.nuspec
 rm -force -ErrorAction SilentlyContinue ./tools/LICENSE.txt
 rm -force -ErrorAction SilentlyContinue ./tools/params.json
+rm -force -ErrorAction SilentlyContinue ./tools/*.orig
 if ($checksum -eq "") {
   rm -force -ErrorAction SilentlyContinue ./*.zip
 }