adminAuto-merging test/lib/devices/fleet_test.rb Auto-merging test/lib/devices/fleet_base.rb CONFLICT (content): Merge conflict in test/lib/devices/fleet_base.rb Auto-merging lib/devices/fleet.rb CONFLICT (content): Merge conflict in lib/devices/fleet.rb Auto-merging config/locales/pt.yml CONFLICT (content): Merge conflict in config/locales/pt.yml Auto-merging config/locales/fr.yml Auto-merging config/locales/fr.devices.yml Auto-merging config/locales/en.yml Auto-merging config/locales/en.devices.yml Auto-merging app/models/route.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago