Closed CharlotteFawsitt closed 5 years ago
I can resolve that conflict when merging. The changes made in this PR are the correct ones. The conflict in develop should be overwritten by this PR.
I can resolve that conflict when merging. The changes made in this PR are the correct ones. The conflict in develop should be overwritten by this PR.