diff --git a/admin-tools/merge-for-3.6.sh b/admin-tools/merge-for-3.6.sh index 7915bda3..82c74335 100755 --- a/admin-tools/merge-for-3.6.sh +++ b/admin-tools/merge-for-3.6.sh @@ -1,7 +1,7 @@ #/bin/bash -uncompyle6_merge_33_owd=$(pwd) +uncompyle6_merge_36_owd=$(pwd) cd $(dirname ${BASH_SOURCE[0]}) -if . ./setup-python-3.3.sh; then +if . ./setup-python-3.6.sh; then git merge master fi -cd $uncompyle6_merge_33_owd +cd $uncompyle6_merge_36_owd