gistfile1.rb

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']