Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 07:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

solve merge conflict

Browse source 
Merge branch 'master' of git://github.com/bsag/tracks

Conflicts:

	.gitignore
This commit is contained in:
Reinier Balt 2008-06-24 20:36:40 +02:00
commit 258958ebdf
4 changed files with 108 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -7,3 +7,4 @@ db/data.yml
db/*.sqlite3
nbproject
vendor/plugins/query_trace/
db/schema.rb