diff --git a/js/build b/js/build index 95a7d08eb..f0078b147 160000 --- a/js/build +++ b/js/build @@ -1 +1 @@ -Subproject commit 95a7d08eb67e6e31367af6bf7fa874128d71c1df +Subproject commit f0078b1474febdc6bf0f95ca56ae6a5208273bff diff --git a/js/scripts/update-precompiled.sh b/js/scripts/update-precompiled.sh index 2d1fa9396..85548cc14 100755 --- a/js/scripts/update-precompiled.sh +++ b/js/scripts/update-precompiled.sh @@ -11,6 +11,7 @@ if [ -z "$1" ]; then exit 1 fi +git fetch git fetch origin $1 git merge $1 -X theirs