Skip to content

Instantly share code, notes, and snippets.

@nmanzi
Created August 6, 2010 02:15
Show Gist options
  • Save nmanzi/510738 to your computer and use it in GitHub Desktop.
Save nmanzi/510738 to your computer and use it in GitHub Desktop.
change this
<<<<<<< HEAD
case modifier
when 'A', 'M'
puts "Uploading #{file}"
ftp.put(file, file)
when 'D'
begin
puts "Deleting #{file}"
ftp.delete(file)
rescue Net::FTPPermError, Net::FTPReplyError => e
#
end
end
end
=======
local_path = options['local_path']
>>>>>>> upstream/master
to this
local_path = options['local_path']
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment