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