Update turbolist3r.py

fix merge error
2019-10-10 19:38:03 -07:00 · 2019-10-10 19:38:03 -07:00 · ee032752d3
parent 5973aeefc9
commit ee032752d3
1 changed files with 0 additions and 7 deletions
--- a/turbolist3r.py
+++ b/turbolist3r.py
@ -24,14 +24,7 @@ from collections import Counter
 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