fixed conflicts

This commit is contained in:
Rushabh Mehta
2012-01-18 10:54:55 +05:30
4 changed files with 4 additions and 3 deletions

1
.gitignore vendored
View File

@@ -6,4 +6,5 @@ user_files
patch.log
lib
versions-local.db
user_files
*.sql*