{"unit":null,"component":"http://weblate.ucs.ru/api/components/kiosk2/kfc/?format=json","translation":null,"dictionary":null,"user":6,"author":null,"timestamp":"2019-07-31T09:36:10","action":22,"target":"CONFLICT (modify/delete): localize/ru_kfc_lng.xlf deleted in master and modified in HEAD. Version HEAD of localize/ru_kfc_lng.xlf left in tree.\nAuto-merging localize/en_kfc_lng.xlf\nCONFLICT (content): Merge conflict in localize/en_kfc_lng.xlf\nRemoving localize/de_kfc_lng.xlf\nAutomatic merge failed; fix conflicts and then commit the result. (1)","id":257330,"action_name":"Failed merge on repository","url":"http://weblate.ucs.ru/api/changes/257330/?format=json"}