Skip to content
Snippets Groups Projects

fix master/develop merge conflicts

Merged fix master/develop merge conflicts
fix-master-conflicts into develop
Merged HJ requested to merge fix-master-conflicts into develop

apparently !1094 (merged) was not in master?

Merge request reports

Pipeline #43151 passed

Stage: lint
Stage: build
Stage: test

Pipeline passed for 045459c7 on fix-master-conflicts

Approval is optional

Merged by HJHJ 2 years ago (Dec 23, 2022 1:25pm UTC)

Merge details

  • Changes merged into develop with 25e628ef.
  • Deleted the source branch.
  • Auto-merge enabled

Pipeline #43152 passed

Stage: lint
Stage: build
Stage: test
Stage: deploy

Pipeline passed for 25e628ef on develop

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
Please register or sign in to reply