Commit b0293d82 authored by David Haynes's avatar David Haynes 🙆
Browse files

Merge branch 'nanderson-fixcollision' into '2.2-dev'

Fix collision resolution

See merge request !85
parents c7362984 5bcb2200
Pipeline #1252 passed with stage
in 1 minute and 38 seconds