Merge branch 'development' into HEAD with conflicts #2
update-configuration.yml
on: push
Update Configuration in manifest.json
25s
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.
|