Change Instance

HTTP 200 OK
Allow: GET, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "unit": null,
    "component": "https://translate.tails.net/api/components/tails/index/?format=api",
    "translation": null,
    "user": "https://translate.tails.net/api/users/emmapeel/?format=api",
    "author": null,
    "timestamp": "2015-08-28T19:54:20Z",
    "action": 22,
    "target": "Auto-merging wiki/src/torrents/files/tails-i386-1.5.1.packages\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent.sig\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.torrent\nRemoving wiki/src/torrents/files/tails-i386-1.4.1.iso.sig\nAuto-merging wiki/src/press.pt.po\nCONFLICT (content): Merge conflict in wiki/src/press.pt.po\nAuto-merging wiki/src/press.fr.po\nCONFLICT (content): Merge conflict in wiki/src/press.fr.po\nAuto-merging wiki/src/news/signing_key_transition.fr.po\nCONFLICT (content): Merge conflict in wiki/src/news/signing_key_transition.fr.po\nAuto-merging wiki/src/news/report_2015_07.mdwn\nAuto-merging wiki/src/doc/get/signing_key_transition.inline.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/get/signing_key_transition.inline.fr.po\nAuto-merging wiki/src/doc/first_steps/start_tails.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/first_steps/start_tails.fr.po\nAuto-merging wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/encryption_and_privacy/encrypted_volumes.fr.po\nAuto-merging wiki/src/doc/advanced_topics/paperkey.fr.po\nCONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.fr.po\nRemoving wiki/src/contribute/working_together/roles/welcome_and_annoying_nitpicker.mdwn\nRemoving features/images/UnsafeBrowserWindow.png\nRemoving features/images/UnsafeBrowserPreferencesMenuItem.png\nRemoving features/images/UnsafeBrowserEditPreferences.png\nRemoving features/images/UnsafeBrowserEditMenu.png\nRemoving features/images/UnsafeBrowserAdvancedSettings.png\nRemoving features/images/USBSuggestsInstall.png\nRemoving features/images/TorBrowserUnableToOpen.png\nRemoving features/images/TailsInstallerNoDevice.png\nRemoving config/chroot_local-patches/apparmor-adjust-user-tmp-abstraction.diff\nRemoving config/chroot_local-patches/apparmor-adjust-home-tunable.diff\nAutomatic merge failed; fix conflicts and then commit the result. (1)",
    "old": "",
    "details": {},
    "id": 17614,
    "action_name": "Repository merge failed",
    "url": "https://translate.tails.net/api/changes/17614/?format=api"
}