From ee032752d38abbe1e782ec7e9c4b6b926cb6b095 Mon Sep 17 00:00:00 2001
From: fleetcaptain <17651144+fleetcaptain@users.noreply.github.com>
Date: Thu, 10 Oct 2019 19:38:03 -0700
Subject: [PATCH] Update turbolist3r.py

fix merge error
---
 turbolist3r.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/turbolist3r.py b/turbolist3r.py
index dd4da6d..739ea35 100644
--- 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