Fix bad resolved conflict for app/assets/javascripts/environments/folder/environments_folder_view.js
Attach a file by drag & drop or click to upload
