resolve merge conflicts of 04c959c to nyc-dev-plus-aosp am: 921c48e50a am: eeb08c7a18
[platform/upstream/VK-GL-CTS.git] / .gitignore
1 *~
2 *.pyc
3 *.user
4 .*
5 !.gitignore
6 !.editorconfig