Fix merge conflicts
Missed this difference in the last commit
This commit is contained in:
parent
aabf600c38
commit
75eef9ef2f
|
@ -1,5 +1,7 @@
|
||||||
# A simple upnp module to forward port for BitMessage
|
# A simple upnp module to forward port for BitMessage
|
||||||
# Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port
|
# Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port
|
||||||
|
import httplib
|
||||||
|
from random import randint
|
||||||
import socket
|
import socket
|
||||||
from struct import unpack, pack
|
from struct import unpack, pack
|
||||||
import threading
|
import threading
|
||||||
|
|
Reference in New Issue
Block a user