Re: Amiga unresolved conflict after merge

[Chris Young]

Just so the list knows, I've resolved these conflicts and sent the
resulting file to Paul.

Chris