py-i2phosts-master: fix dirty merge

9 years ago · cb38a370c0
1 changed files with 0 additions and 6 deletions
--- a/bin/py-i2phosts-master
+++ b/bin/py-i2phosts-master
@ -13,15 +13,9 @@ import threading
				@@ -13,15 +13,9 @@ import threading
 import daemon
 # workaround for python-daemon >= 1.6
 try:
-<<<<<<< HEAD
    import daemon.pidlockfile as pidfile
 except ImportError:
    import daemon.pidfile as pidfile
-=======
-    import daemon.pidlockfile as pidfile
-except ImportError:
-    import daemon.pidfile as pidfile
->>>>>>> 923b94f... Convert tabs to spaces

 class Thread(threading.Thread):