Fix merge conflicts

Missed this difference in the last commit
master
Peter Šurda 7 years ago
parent aabf600c38
commit 75eef9ef2f
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
  1. 2
      src/upnp.py

@ -1,5 +1,7 @@
# A simple upnp module to forward port for BitMessage
# Reference: http://mattscodecave.com/posts/using-python-and-upnp-to-forward-a-port
import httplib
from random import randint
import socket
from struct import unpack, pack
import threading

Loading…
Cancel
Save