{"unit":null,"component":"http://weblate.ucs.ru/api/components/kiosk2/kfc/?format=json","translation":null,"dictionary":null,"user":6,"author":null,"timestamp":"2019-06-19T07:53:24","action":22,"target":"Auto-merging src/main/java/core/rk7/manager/settings/xmlinterface/XmlInterfaceSettings.java\nAuto-merging src/main/java/core/rk7/manager/settings/server/TwoStepsAuth.java\nAuto-merging src/main/java/core/rk7/manager/settings/server/ServerSettings.java\nAuto-merging src/main/java/core/rk7/manager/settings/server/Lng.java\nAuto-merging src/main/java/core/rk7/manager/settings/server/CashServerXMLInterfaceTCP.java\nAuto-merging src/main/java/core/rk7/manager/settings/SettingsKiosk.java\nAuto-merging src/main/java/core/rk7/manager/settings/Settings.java\nAuto-merging src/main/java/core/rk7/manager/settings/CEF/Positions.java\nAuto-merging src/main/java/core/rk7/manager/settings/CEF/CEFSettings.java\nAuto-merging src/main/java/core/rk7/RK7OrderUtils/enums/Rk7EQNums.java\nAuto-merging localize/en_kfc_lng.xlf\nCONFLICT (content): Merge conflict in localize/en_kfc_lng.xlf\nAuto-merging front/bk/src/components/filters.js\nAutomatic merge failed; fix conflicts and then commit the result. (1)","id":214461,"action_name":"Failed merge on repository","url":"http://weblate.ucs.ru/api/changes/214461/?format=json"}