Skip to content
Snippets Groups Projects

fix files after back porting merges from master to atlas/v27r2

Merged Charles Leggett requested to merge leggett/AtlasGaudi:dev/fixMerges into atlas/v27r2

a few files got messed up in the back-port of a large number of merges from master to atlas/v27r2, due to issues with the ordering of the merges. this MR fixes them.

Merge request reports

Loading
Loading

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
Loading