Skip to content
Snippets Groups Projects
Select Git revision
1 result Searching

baselineselector.cpp

user avatar
Alexander van Amesfoort authored
Fix merge conflict on momqueryservice.py. Moved on trunk, but changed on this branch.
Solve by replacing the moved file with the changed file (thus, move the changed file over the moved file).
Careful checking of (JD's) changes shows this is correct; the changes are preserved.
Other moved files did not cause conflicts, since they were not changed.
03b2a810
History
Code owners
Assign users and groups as approvers for specific file changes. Learn more.