aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-05-11 19:26:54 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2017-05-11 19:27:18 +0200
commiteb8263bdc9d302460f7785a911493c8d6a331ebf (patch)
tree9de1c01415f13dfa9b7e4ce546eca5a6d94f8812 /contrib/devtools
parent18c9debe602db71712b48b1c6fc521270109b53d (diff)
parent0c60c63de0b6306b586727bb327d00549de4abe8 (diff)
Merge #10317: Remove unused Python imports
0c60c63 Remove unused Python imports (practicalswift) Tree-SHA512: c7ae6a8ae2c751b771804960498bf270ab022c80fa9e1b39118d5986d890c8cdfc27a3cc24bf28c080d8088ddc11facd1f2881ba2c209cdd819675fda4689d83
Diffstat (limited to 'contrib/devtools')
-rwxr-xr-xcontrib/devtools/github-merge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/devtools/github-merge.py b/contrib/devtools/github-merge.py
index 03ccf5b624..8fce648fc2 100755
--- a/contrib/devtools/github-merge.py
+++ b/contrib/devtools/github-merge.py
@@ -15,7 +15,7 @@
# In case of a clean merge that is accepted by the user, the local branch with
# name $BRANCH is overwritten with the merged result, and optionally pushed.
from __future__ import division,print_function,unicode_literals
-import os,sys
+import os
from sys import stdin,stdout,stderr
import argparse
import hashlib