git-command #374
Triggered via repository dispatch
August 12, 2024 12:19
robot-ci-heartex
git-command
5b916d5
Status
Success
Total duration
2m 37s
Artifacts
–
git-command.yml
on: repository_dispatch
merge
2m 26s
help
0s
Annotations
7 notices
merge:
web/dist/apps/labelstudio/main.js#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/main.js
|
merge:
web/dist/apps/labelstudio/main.js.map#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/main.js.map
|
merge:
web/dist/apps/labelstudio/version.json#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/version.json
|
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
|