adminRemoving public/500.html Removing public/422.html Removing public/404.html 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/assets/javascripts/devices.js Automatic merge failed; fix conflicts and then commit the result. (1)8 years ago
None