git-command #310
Triggered via repository dispatch
May 8, 2024 19:44
robot-ci-heartex
git-command
46c944f
Status
Success
Total duration
2m 21s
Artifacts
–
git-command.yml
on: repository_dispatch
merge
2m 12s
help
0s
Annotations
8 notices
merge:
web/dist/apps/labelstudio/main.js#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/main.js
|
merge:
web/dist/apps/labelstudio/version.json#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/version.json
|
merge:
web/dist/libs/datamanager/main.js#L1
Merge Conflict automatically resolved web/dist/libs/datamanager/main.js
|
merge:
web/dist/libs/datamanager/main.js.map#L1
Merge Conflict automatically resolved web/dist/libs/datamanager/main.js.map
|
merge:
web/dist/libs/datamanager/version.json#L1
Merge Conflict automatically resolved web/dist/libs/datamanager/version.json
|
merge:
web/dist/libs/editor/main.js#L1
Merge Conflict automatically resolved web/dist/libs/editor/main.js
|
merge:
web/dist/libs/editor/main.js.map#L1
Merge Conflict automatically resolved web/dist/libs/editor/main.js.map
|
merge:
web/dist/libs/editor/version.json#L1
Merge Conflict automatically resolved web/dist/libs/editor/version.json
|