resolve merge conflicts of 3ffc2f2 to master
[platform/upstream/VK-GL-CTS.git] / external / zlib / .gitignore
1 src
2 packages