r4sas/py-i2phosts
1
0
Fork 0
mirror of https://github.com/r4sas/py-i2phosts synced 2025-01-22 12:34:17 +00:00
Code Issues Releases Wiki Activity

py-i2phosts-master: fix dirty merge

Browse Source
This commit is contained in:
Hidden Z 2015-11-06 17:24:25 +00:00
parent c6f6c0ce26
commit cb38a370c0
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/py-i2phosts-master
View File

@ -13,15 +13,9 @@ import threading
import daemon import daemon
# workaround for python-daemon >= 1.6 # workaround for python-daemon >= 1.6
try: try:
<<<<<<< HEAD
import daemon.pidlockfile as pidfile
except ImportError:
import daemon.pidfile as pidfile
=======
import daemon.pidlockfile as pidfile import daemon.pidlockfile as pidfile
except ImportError: except ImportError:
import daemon.pidfile as pidfile import daemon.pidfile as pidfile
>>>>>>> 923b94f... Convert tabs to spaces
class Thread(threading.Thread): class Thread(threading.Thread):