Comment 2 for bug 1173469

Revision history for this message
michael crompton (michaelc37-l) wrote :

recently updated from an old checkout, and found these merge marker compiler errors.
it would be nice if the code was not left in this state.
anyone has a workaround?