git-command #383
Triggered via repository dispatch
August 14, 2024 14:22
robot-ci-heartex
git-command
c147ae8
Status
Success
Total duration
1m 44s
Artifacts
–
git-command.yml
on: repository_dispatch
merge
1m 36s
help
0s
Annotations
7 notices
merge:
web/dist/apps/labelstudio/main.css#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/main.css
|
merge:
web/dist/apps/labelstudio/main.css.map#L1
Merge Conflict automatically resolved web/dist/apps/labelstudio/main.css.map
|
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/version.json#L1
Merge Conflict automatically resolved web/dist/libs/editor/version.json
|