Merge branch 'tftp_client' of github_r7:rapid7/metasploit-framework into tftp_client

Conflicts: modules/auxiliary/admin/tftp/tftp_upload_file.rb
2011-12-16 22:41:22 -06:00 · 2011-12-16 22:41:22 -06:00 · 1201d7fbf2
parent 0b8914021c a6867ef128
commit 1201d7fbf2
1 changed files with 3 additions and 0 deletions
--- a/modules/auxiliary/admin/tftp/tftp_upload_file.rb
+++ b/modules/auxiliary/admin/tftp/tftp_upload_file.rb
@ -95,9 +95,12 @@ class Metasploit3 < Msf::Auxiliary
 		@tftp_client.thread.join
 	end

+<<<<<<< HEAD
 	def cleanup
 		# Need to kill the server in case of interruption
 	end

+=======
+>>>>>>> a6867ef1287af1786b2e0cd6e7b13fdb8099ce2a
 end