adminAuto-merging test/test_helper.rb Auto-merging test/models/import_benchmark_test.rb CONFLICT (content): Merge conflict in test/models/import_benchmark_test.rb Auto-merging test/models/customer_test.rb Auto-merging test/mailers/user_mailer_test.rb CONFLICT (content): Merge conflict in test/mailers/user_mailer_test.rb Auto-merging 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 CONFLICT (content): Merge conflict in config/locales/fr.yml Auto-merging config/initializers/layout_mail.rb Auto-merging app/views/zonings/_form.html.erb Auto-merging app/views/plannings/_edit.html.erb Auto-merging app/models/customer.rb CONFLICT (content): Merge conflict in app/models/customer.rb Auto-merging app/jobs/optimizer_job.rb CONFLICT (content): Merge conflict in app/jobs/optimizer_job.rb Auto-merging app/jobs/optimizer.rb CONFLICT (content): Merge conflict in app/jobs/optimizer.rb Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago