Skip to content

Merge branch 'development' into HEAD with conflicts #2

Merge branch 'development' into HEAD with conflicts

Merge branch 'development' into HEAD with conflicts #2

Triggered via push October 10, 2024 08:27
Status Failure
Total duration 37s
Artifacts
Update Configuration in manifest.json
25s
Update Configuration in manifest.json
Fit to window
Zoom out
Zoom in

Annotations

10 errors
Update Configuration in manifest.json: src/types/plugin-inputs.ts#L35
Merge conflict marker encountered.
Update Configuration in manifest.json: src/types/plugin-inputs.ts#L125
Merge conflict marker encountered.
Update Configuration in manifest.json: src/types/plugin-inputs.ts#L145
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L4
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L6
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L8
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L53
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L61
Merge conflict marker encountered.
Update Configuration in manifest.json: tests/main.test.ts#L64
Merge conflict marker encountered.
Update Configuration in manifest.json
Process completed with exit code 2.