Commit 0fc82866 authored by Pekrul, Heather's avatar Pekrul, Heather Committed by Lea Verou

Remove merge flags that were left in

parent fc9f00f1
Pipeline #40 failed with stages
in 0 seconds