Resolved conflicts merging back from release

Merge branch 'release' Conflicts: lib/rex/post/meterpreter/extensions/sniffer/sniffer.rb modules/exploits/windows/license/flexnet_lmgrd_bof.rb
2012-05-24 00:27:41 -05:00 · 2012-05-24 00:27:41 -05:00 · 5004515187
parent 101abb45a1 a37e98f159
commit 5004515187
1 changed files with 1 additions and 0 deletions
--- a/modules/exploits/windows/license/flexnet_lmgrd_bof.rb
+++ b/modules/exploits/windows/license/flexnet_lmgrd_bof.rb
@ -203,3 +203,4 @@ class Metasploit3 < Msf::Exploit::Remote
 	end
 end
`@ -203,3 +203,4 @@ class Metasploit3 < Msf::Exploit::Remote`
	`end`	`end`

	`end`	`end`