Merge remote-tracking branch 'upstream/master'

2019-01-02 11:33:46 +05:30
parent 3c80767270 63ce358f30
commit dca581a2d9
2 changed files with 2 additions and 1 deletions
--- a/contracts/mocks/ERC20DetailedMock.sol
+++ b/contracts/mocks/ERC20DetailedMock.sol
--- a/scripts/build.sh
+++ b/scripts/build.sh
@ -7,7 +7,8 @@ set -o errexit
 rm -rf build

 # Create a temporary directory to place ignored files (e.g. examples).
-tmp_dir="$(mktemp -dp.)"
+tmp_dir="ignored_contracts"
+mkdir "$tmp_dir"

 # Move the ignored files to the temporary directory.
 while IFS="" read -r ignored