resolve merge conflicts, effectively reverting "verbose" setting
[openpower-isa.git] / .gitignore
1 .*.sw?
2 __pycache__