Fix merge conflicts

Missed this difference in the last commit
This commit is contained in:
Peter Šurda 2016-05-02 17:33:18 +02:00
parent aabf600c38
commit 75eef9ef2f
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 2 additions and 0 deletions

View File

@ -1,5 +1,7 @@
# A simple upnp module to forward port for BitMessage
# Reference:
import httplib
from random import randint
import socket
from struct import unpack, pack
import threading