Bump js-precompiled to 20161018-161705 (#2698)
* Global fetch before specific sha fetch * Update to js-precompiled 20161018-161705
This commit is contained in:
parent
b359e09bb6
commit
6aed6a45d3
2
js/build
2
js/build
@ -1 +1 @@
|
||||
Subproject commit 95a7d08eb67e6e31367af6bf7fa874128d71c1df
|
||||
Subproject commit f0078b1474febdc6bf0f95ca56ae6a5208273bff
|
@ -11,6 +11,7 @@ if [ -z "$1" ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
git fetch
|
||||
git fetch origin $1
|
||||
git merge $1 -X theirs
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user