fix merge conflict

lib/msf/util/exe.rb

@@ -56,6 +56,17 @@ require 'msf/core/exe/segment_injector'
     end
   end
 
+  def self.read_replace_script_template(filename, hash_sub)
+    template_pathname = File.join(Msf::Config.install_root, "data", "templates", "scripts", filename)
+
+    template = ''
+    File.open(template_pathname, "rb") do |f|
+      template = f.read
+    end
+
+    return template % hash_sub
+  end
+
 
   ##
   #