aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2017-01-18 10:48:43 +0100
committerMarcoFalke <[email protected]>2017-01-18 10:48:52 +0100
commitb0b57a17306a7e963a4fe463f84e2b150a00a859 (patch)
tree809d4c3942e8042045767ef40e37ccc0e7701bc8 /contrib/devtools/github-merge.py
parentMerge #9561: Wake message handling thread when we receive a new block (diff)
parentRemove unused Python imports (diff)
downloaddiscoin-b0b57a17306a7e963a4fe463f84e2b150a00a859.tar.xz
discoin-b0b57a17306a7e963a4fe463f84e2b150a00a859.zip
Merge #9508: Remove unused Python imports
95bab82 Remove unused Python imports (practicalswift)
Diffstat (limited to 'contrib/devtools/github-merge.py')
-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 aae966a8f..0cee0921b 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 subprocess