From 19e2772729bbe37b266cd1d9a51eaa045221a4bb Mon Sep 17 00:00:00 2001
From: Peter <vanderlaan.pm@gmail.com>
Date: Sun, 27 Apr 2014 15:49:15 +0200
Subject: [PATCH] Update wpscan.rb

---
 wpscan.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/wpscan.rb b/wpscan.rb
index 0f33901f..098fe390 100755
--- a/wpscan.rb
+++ b/wpscan.rb
@@ -67,7 +67,6 @@ def main
       if wpscan_options.follow_redirection
         puts "Following redirection #{redirection}"
       else
-<<<<<<< HEAD
         puts "#{blue('[i]')} The remote host tried to redirect to: #{redirection}"
         print "[?] Do you want follow the redirection ? [y/n] "
       end
@@ -78,7 +77,6 @@ def main
       else
         puts "#{red('[!]')} Scan aborted"
         exit(0)
-=======
         puts "The remote host redirects to: #{redirection}"
         puts '[?] Do you want follow the redirection ? [Y]es [N]o [A]bort, default: [N]'
       end
@@ -93,7 +91,6 @@ def main
             exit(0)
           end
         end
->>>>>>> master
       end
     end