adminRemoving test/fixtures/files/import_vehicle_usage_sets_without_vehicle_name.csv Removing test/fixtures/files/import_vehicle_usage_sets_without_open_close.csv Removing test/fixtures/files/import_vehicle_usage_sets_without_conf_name.csv Auto-merging config/locales/fr.yml CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/locales/en.yml CONFLICT (content): Merge conflict in config/locales/en.yml Removing app/views/route_mailer/send_kmz_route.text.erb Removing app/views/route_mailer/send_computed_ics_route.text.erb Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago