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
This commit is contained in:
@@ -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({
|
||||
|
||||
Reference in New Issue
Block a user