🎉 v2.1 release - minor fixes

k4m4 · Feb 2, 2018 · 479406a · 479406a
1 parent 5254f12
commit 479406a
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/onioff.py b/onioff.py
@@ -189,11 +189,7 @@ def main():
             os._exit(1)
         except:
             nowPrint("\n[-] Tor offline --> Please make sure Tor is running", True)
-<<<<<<< HEAD
-            nowPrint("\n[-] System exit", True)
-=======
             nowPrint("\n[-] Exiting...\n", True)
->>>>>>> 5ad2c1998e4a4db5d7d774e63c2e02e5f16da717
             os._exit(1)