Change Instance

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

{
    "unit": null,
    "component": "https://weblate.foundryvtt-hub.com/api/components/babonus/main/?format=api",
    "translation": null,
    "user": "https://weblate.foundryvtt-hub.com/api/users/krbz999/?format=api",
    "author": null,
    "timestamp": "2024-02-14T09:33:15.497989Z",
    "action": 22,
    "target": "Removing templates/babonus.hbs\nRemoving setup.mjs\nRemoving scripts/helpers/headerButtons.mjs\nRemoving scripts/data/ModifiersModel.mjs\nRemoving scripts/data/ConsumptionModel.mjs\nRemoving scripts/applications/rollConfigApp.mjs\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
    "old": "",
    "details": {
        "error": "Removing templates/babonus.hbs\nRemoving setup.mjs\nRemoving scripts/helpers/headerButtons.mjs\nRemoving scripts/data/ModifiersModel.mjs\nRemoving scripts/data/ConsumptionModel.mjs\nRemoving scripts/applications/rollConfigApp.mjs\nAuto-merging lang/fr.json\nCONFLICT (content): Merge conflict in lang/fr.json\nAutomatic merge failed; fix conflicts and then commit the result.\n (1)",
        "status": "On branch main\nYour branch and 'origin/main' have diverged,\nand have 1 and 32 different commits each, respectively.\n  (use \"git pull\" to merge the remote branch into yours)\n\nYou have unmerged paths.\n  (fix conflicts and run \"git commit\")\n  (use \"git merge --abort\" to abort the merge)\n\nChanges to be committed:\n\tmodified:   .github/workflows/main.yml\n\tmodified:   README.md\n\tmodified:   lang/en.json\n\tmodified:   module.json\n\tmodified:   scripts/api.mjs\n\trenamed:    scripts/applications/appliedBonusesDialog.mjs -> scripts/applications/applied-bonuses-dialog.mjs\n\tmodified:   scripts/applications/babonus-sheet.mjs\n\trenamed:    scripts/applications/babonus.mjs -> scripts/applications/babonus-workshop.mjs\n\trenamed:    scripts/applications/bonusCollector.mjs -> scripts/applications/bonus-collector.mjs\n\tnew file:   scripts/applications/character-sheet-tab.mjs\n\trenamed:    scripts/applications/keysDialog.mjs -> scripts/applications/keys-dialog.mjs\n\tnew file:   scripts/applications/optional-selector.mjs\n\tdeleted:    scripts/applications/rollConfigApp.mjs\n\tmodified:   scripts/constants.mjs\n\tdeleted:    scripts/data/ConsumptionModel.mjs\n\tdeleted:    scripts/data/ModifiersModel.mjs\n\tmodified:   scripts/data/_module.mjs\n\trenamed:    scripts/data/AuraModel.mjs -> scripts/data/aura-model.mjs\n\trenamed:    scripts/data/BabonusModel.mjs -> scripts/data/babonus-model.mjs\n\tnew file:   scripts/data/consumption-model.mjs\n\trenamed:    scripts/data/fields/ArbitraryComparisonField.mjs -> scripts/data/fields/arbitrary-comparison-field.mjs\n\trenamed:    scripts/data/fields/CheckboxFields.mjs -> scripts/data/fields/checkbox-fields.mjs\n\trenamed:    scripts/data/fields/CustomScriptsField.mjs -> scripts/data/fields/custom-scripts-field.mjs\n\trenamed:    scripts/data/fields/FeatureTypesField.mjs -> scripts/data/fields/feature-types-field.mjs\n\trenamed:    scripts/data/fields/HealthPercentagesField.mjs -> scripts/data/fields/health-percentages-field.mjs\n\trenamed:    scripts/data/fields/RemainingSpellSlotsField.mjs -> scripts/data/fields/remaining-spell-slots-field.mjs\n\trenamed:    scripts/data/fields/SemicolonFields.mjs -> scripts/data/fields/semicolon-fields.mjs\n\trenamed:    scripts/data/fields/SpellComponentsField.mjs -> scripts/data/fields/spell-components-field.mjs\n\trenamed:    scripts/data/fields/TokenSizesField.mjs -> scripts/data/fields/token-sizes-field.mjs\n\trenamed:    scripts/data/FilterMixin.mjs -> scripts/data/filter-mixin.mjs\n\tnew file:   scripts/data/modifiers-model.mjs\n\trenamed:    scripts/filters.mjs -> scripts/filter-manager.mjs\n\tnew file:   scripts/helpers/header-button.mjs\n\tdeleted:    scripts/helpers/headerButtons.mjs\n\trenamed:    scripts/helpers/rollHooks.mjs -> scripts/helpers/roll-hooks.mjs\n\tmodified:   scripts/hooks.mjs\n\tdeleted:    setup.mjs\n\tmodified:   styles/keys.css\n\tnew file:   styles/shared.css\n\tmodified:   styles/sheet.css\n\tmodified:   styles/workshop.css\n\tmodified:   templates/babonus-sheet.hbs\n\tnew file:   templates/babonus-workshop.hbs\n\tdeleted:    templates/babonus.hbs\n\trenamed:    templates/subapplications/appliedBonusesDialog.hbs -> templates/subapplications/applied-bonuses-dialog.hbs\n\tnew file:   templates/subapplications/character-sheet-tab.hbs\n\trenamed:    templates/subapplications/keysDialog.hbs -> templates/subapplications/keys-dialog.hbs\n\trenamed:    templates/subapplications/optionalBonuses.hbs -> templates/subapplications/optional-selector.hbs\n\nUnmerged paths:\n  (use \"git add <file>...\" to mark resolution)\n\tboth modified:   lang/fr.json\n\n"
    },
    "id": 441556,
    "action_name": "Repository merge failed",
    "url": "https://weblate.foundryvtt-hub.com/api/changes/441556/?format=api"
}