added a conflict
[munin-test.git] / .gitignore
blob710b04707a4d5fd4947b8917572222fe2d540b24
1 secret_password
2 *~
3 *.logdb/schema.rb
4 db/schema.sql
5 *.[oa]