Skip to content
Snippets Groups Projects

Resolve "Show conflicts in grid"

Merged Resolve "Show conflicts in grid"
11-show-conflicts-in-grid into master
Merged
Benoît Harraultrequested to merge
11-show-conflicts-in-grid into master

Closes #11 (closed)

Edited by Benoît Harrault

Merge request reports

Pipeline #1405 passed

Stage: update
Stage: build-debug

Pipeline passed for 2ce6ca92 on 11-show-conflicts-in-grid

Approval is optional

Merged by Benoît HarraultBenoît Harrault Jun 19, 2021 (Jun 19, 2021 8:13am UTC)

Merge details

  • Changes merged into master with 5f6335e9.
  • Deleted the source branch.

  • Closed #11 (closed)

  • Auto-merge enabled

Pipeline #1406 passed

Stage: update
Stage: build-debug
Stage: build-release
Stage: deploy

Pipeline passed for 5f6335e9 on master

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