fixed conflict
[python-gstreamer-examples] / .gitignore
1 # Ignore Glade's temp files
2 *~