{"unit":null,"component":"http://weblate.ucs.ru/api/components/marketing-desktop/md-common/?format=json","translation":null,"dictionary":null,"user":6,"author":null,"timestamp":"2018-07-30T14:53:04","action":22,"target":"Auto-merging source/app/i18n/common/en.json\nCONFLICT (content): Merge conflict in source/app/i18n/common/en.json\nAuto-merging source/app/directive.js\nAuto-merging source/app/constant.js\nAuto-merging source/app/components/Templates/TemplatesController.js\nAuto-merging source/app/components/Templates/Templates.html\nAuto-merging source/app/components/Schedules/SchedulesController.js\nAuto-merging source/app/components/Schedules/Schedules.html\nAuto-merging source/app/components/Layout/LayoutController.js\nAuto-merging source/app/components/Install/InstallLayout.html\nAuto-merging source/app/components/Install/InstallController.js\nAuto-merging source/app/components/Guests/GuestsController.js\nAuto-merging source/app/components/Guests/Guests.html\nAuto-merging source/app/components/Guests/Guests.Sidebar.html\nAuto-merging source/app/components/GuestProfile/GuestProfileController.js\nAuto-merging source/app/components/GuestProfile/GuestProfile.html\nAuto-merging source/app/components/AutoTags/AutoTagsController.js\nAuto-merging source/app/components/Auth/LogoutController.js\nAuto-merging source/app/components/Auth/LoginController.js\nAuto-merging source/app/common.js\nAuto-merging source/app/app.js\nAuto-merging source/app/api.js\nRemoving source/app/Views/Main/Schedules.html\nRemoving source/app/Views/Main/Schedules.Sidebar.html\nRemoving source/app/Views/Main/Schedules.Header.html\nRemoving source/app/Views/Main/Guests.html\nRemoving source/app/Views/Main/Guests.Sidebar.html\nRemoving source/app/Views/Main/Guests.Header.html\nRemoving source/app/Components/Schedules/Schedules.Sidebar.html\nRemoving source/app/Components/Schedules/Schedules.Header.html\nRemoving source/app/Components/LastClosed/LastClosed.html\nRemoving source/app/Components/KnowledgeBase/KnowledgeBase.html\nRemoving source/app/Components/Favorites/Favorites.html\nRemoving source/app/Components/Auth/Logout.html\nRemoving build/app/Views/Main/Schedules.html\nRemoving build/app/Views/Main/Guests.html\nRemoving build/app/Views/Main/Guests.Sidebar.html\nRemoving build/app/Views/Main/Guests.Header.html\nAutomatic merge failed; fix conflicts and then commit the result. (1)","id":53571,"action_name":"Failed merge on repository","url":"http://weblate.ucs.ru/api/changes/53571/?format=json"}