adminAuto-merging lib/devices/fleet.rb Auto-merging config/locales/pt.yml Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/locales/en.yml Auto-merging app/views/vehicle_usage_sets/show.excel.ruby Auto-merging app/views/vehicle_usage_sets/show.csv.ruby Auto-merging app/models/planning.rb Auto-merging app/jobs/importer_vehicle_usage_sets.rb Auto-merging app/controllers/plannings_controller.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago