Failed merge on repository
Mapotempo App / Mapotempo App
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 Automatic merge failed; fix conflicts and then commit the result. (1)
Committed changes
Mapotempo App / Mapotempo App — English
Mapotempo App / Mapotempo App — Hebrew
Rebased repository
Resource update
Merged repository
Reset repository
Auto-merging config/locales/he.yml CONFLICT (content): Merge conflict in config/locales/he.yml Automatic merge failed; fix conflicts and then commit the result. (1)
admin
None