Resource update
Mapotempo App / Mapotempo App — Spanish
Committed changes
Rebased repository
Mapotempo App / Mapotempo App
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — English
Merged repository
Reset repository
Failed rebase on repository
error: Failed to merge in the changes. (128)
Failed merge on repository
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)
admin
None