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