"analysis/git@git.cbm.gsi.de:computing/cbmroot.git" did not exist on "35afe0ea6713bbb783803691b84ef57aa20b9772"
make rich_v24a default
2 unresolved threads
2 unresolved threads
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 1
− 1