Skip to content

Fixing semantic merge conflict

John Cai requested to merge jc-fix-semantic-merge-conflict into master

merging !2292 (merged) caused a semantic merge conflict. This MR fixes that.

Merge request reports