Failed merge on repository
Mapotempo App / Mapotempo App
Auto-merging config/locales/pt.yml CONFLICT (content): Merge conflict in config/locales/pt.yml Automatic merge failed; fix conflicts and then commit the result. (1)
Rebased repository
Resource update
Mapotempo App / Mapotempo App — Portuguese
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — Spanish
Mapotempo App / Mapotempo App — English
Merged repository
Committed changes
Added to glossary
Mapotempo App — Portuguese Mapotempo App
Auto-merging config/locales/pt.yml CONFLICT (add/add): Merge conflict in config/locales/pt.yml Auto-merging config/locales/es.yml CONFLICT (add/add): Merge conflict in config/locales/es.yml Automatic merge failed; fix conflicts and then commit the result. (1)
admin
None
jferreira