Convert tabs to spaces

9 years ago · 6e3862d7ab
40 changed files with 1121 additions and 1115 deletions
--- a/bin/py-i2phosts-master
+++ b/bin/py-i2phosts-master
@ -13,9 +13,15 @@ import threading
				@@ -13,9 +13,15 @@ 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):

--- a/pyi2phosts/static-common/rss-grey-18.png
+++ b/pyi2phosts/static-common/rss-grey-18.png