Reverts Gemfile stuff

Author: msutovsky-r7

metasploit-framework.gemspec

@@ -74,11 +74,7 @@ Gem::Specification.new do |spec|
   # are needed when there's no database
   spec.add_runtime_dependency 'metasploit-model'
   # Needed for Meterpreter
-<<<<<<< HEAD
   spec.add_runtime_dependency 'metasploit-payloads', '2.0.244'
-=======
-  spec.add_runtime_dependency 'metasploit-payloads', '2.0.242'
->>>>>>> d6e593f3c4f (Restores Gemfile)
   # Needed for the next-generation POSIX Meterpreter
   spec.add_runtime_dependency 'metasploit_payloads-mettle', '1.0.46'
   # Needed by msfgui and other rpc components