Skip to content
Snippets Groups Projects

Fix merge error

Merged Jacques Xing requested to merge CFD-Xing/redesign-prototypes:fix/merge-error into master

This MR closes #4 (closed) and solves a merge error from MR !11 (merged).

Edited by Chris Cantwell

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