From fdea2ac07b6d1d9f8791635b19ab44e4c8076886 Mon Sep 17 00:00:00 2001
From: xntrik <xntrik@b87d56ec-f9c0-11de-8c8a-61c5e9addfc9>
Date: Sun, 24 Jul 2011 09:47:55 +0000
Subject: [PATCH] module code had git comments in it which were breaking the
 framework

git-svn-id: https://beef.googlecode.com/svn/trunk@1094 b87d56ec-f9c0-11de-8c8a-61c5e9addfc9
---
 modules/browser/hook_ie/module.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/modules/browser/hook_ie/module.rb b/modules/browser/hook_ie/module.rb
index c2317af7f..dee1b79b0 100644
--- a/modules/browser/hook_ie/module.rb
+++ b/modules/browser/hook_ie/module.rb
@@ -1,6 +1,3 @@
-<<<<<<< .mine
-class Hook_ie < BeEF::Core::Command
-=======
 #
 #   Copyright 2011 Wade Alcorn wade@bindshell.net
 #
@@ -16,8 +13,8 @@ class Hook_ie < BeEF::Core::Command
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-class Detect_details < BeEF::Core::Command
->>>>>>> .r1087
+
+class Hook_ie < BeEF::Core::Command
   
   def initialize
     super({