Skip to content

Commit

Permalink
Administriva
Browse files Browse the repository at this point in the history
  • Loading branch information
rocky committed Nov 28, 2024
1 parent 4ac5564 commit 74b39e2
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions admin-tools/merge-for-3.6.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 74b39e2

Please sign in to comment.