From 1dc69f162123d627d4939596357ba00a7cc1f265 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Thu, 7 Sep 2017 20:34:02 -0400
Subject: [PATCH] BruteX by 1N3@CrowdShield

---
 CHANGELOG.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebc494e..2cfc80a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,5 @@
-<<<<<<< HEAD
-##CHANGELOG:
-* v1.6 Removed HTTP/HTTPS basic auth checks to normal scans. Use brutex <IP> port <80/443> to scan with that option... 
-=======
 ## CHANGELOG:
->>>>>>> fad25d3ab9ffaeda62824e28960b8816fcaa5a15
+* v1.6 Removed HTTP/HTTPS basic auth checks to normal scans. Use brutex <IP> port <80/443> to scan with that option... 
 * v1.5b Fixed issue with dirb
 * v1.5a Removed clear command
 * v1.5 Added install.sh