Get rid of the CVS merge characters that have worked their way into this causing...

[wxWidgets.git] / src / zlib / makemac.mcp

diff --git a/src/zlib/makemac.mcp b/src/zlib/makemac.mcp
index 576ae208bcbf55e1424499597d6679aed43d9a28..99a1766456b0bb62b051995031938edff45d8717 100644 (file)
Binary files a/src/zlib/makemac.mcp and b/src/zlib/makemac.mcp differ