{"unit":null,"component":"http://translate.pkp.sfu.ca/api/components/plugins/browseBySection/?format=json","translation":null,"user":"http://translate.pkp.sfu.ca/api/users/admin/?format=json","author":null,"timestamp":"2023-02-17T22:57:48.113899Z","action":22,"target":"CONFLICT (rename/delete): locale/pt/locale.po deleted in main and renamed to locale/pt_PT/locale.po in HEAD. Version HEAD of locale/pt_PT/locale.po left in tree.\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)","id":673029,"action_name":"Failed merge on repository","url":"http://translate.pkp.sfu.ca/api/changes/673029/?format=json"}