git-command #331
Triggered via repository dispatch
June 14, 2024 14:29
robot-ci-heartex
git-command
9df4eb9
Status
Success
Total duration
1m 46s
Artifacts
–
git-command.yml
on: repository_dispatch
merge
1m 38s
help
0s
Annotations
7 notices
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
|
merge:
web/libs/editor/src/components/SidePanels/DetailsPanel/DetailsPanel.tsx#L1
Merge Conflict automatically resolved web/libs/editor/src/components/SidePanels/DetailsPanel/DetailsPanel.tsx
|
merge:
web/libs/editor/src/components/SidePanels/DetailsPanel/RelationsControls.tsx#L1
Merge Conflict automatically resolved web/libs/editor/src/components/SidePanels/DetailsPanel/RelationsControls.tsx
|