tracks/.gitignore
Reinier Balt 258958ebdf solve merge conflict
Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:

	.gitignore
2008-06-24 20:36:40 +02:00

10 lines
135 B
Text

*.tmproj
config/database.yml
config/environment.rb
log
tmp
db/data.yml
db/*.sqlite3
nbproject
vendor/plugins/query_trace/
db/schema.rb