Update turbolist3r.py

fix merge error
fleetcaptain · Oct 11, 2019 · ee03275 · ee03275
1 parent 5973aee
commit ee03275
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/turbolist3r.py b/turbolist3r.py
@@ -24,14 +24,7 @@
 try:
     from subbrute import subbrute
 except:
-<<<<<<< HEAD
     print("Failed to import subbrute, you will not be able to bruteforce")
-
-#import dns.resolver
-=======
-	print("Failed to import subbrute, you will not be able to bruteforce")
-import dns.resolver
->>>>>>> 84d82d9019bc65d836e14ce8d8959fd1deafd1de
 import requests
 
 # import dnslib, which provides better features compared to dns.resolver for finding subdomains