grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump js-precompiled to 20161018-161705 (#2698)

Browse Source 
* Global fetch before specific sha fetch

* Update to js-precompiled 20161018-161705
This commit is contained in:
Jaco Greeff 2016-10-19 11:03:08 +02:00 committed by Gav Wood
parent b359e09bb6
commit 6aed6a45d3
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/build

@ -1 +1 @@
Subproject commit 95a7d08eb67e6e31367af6bf7fa874128d71c1df Subproject commit f0078b1474febdc6bf0f95ca56ae6a5208273bff

1
js/scripts/update-precompiled.sh
View File

@ -11,6 +11,7 @@ if [ -z "$1" ]; then
exit 1 exit 1
fi fi
git fetch
git fetch origin $1 git fetch origin $1
git merge $1 -X theirs git merge $1 -X theirs