merge and add .orig to gitignore

This commit is contained in:
John Bintz 2011-09-03 16:45:09 -04:00
commit 5baaf8f6e3
1 changed files with 2 additions and 0 deletions

2
.gitignore vendored
View File

@ -2,3 +2,5 @@
.bundle .bundle
Gemfile.lock Gemfile.lock
pkg/* pkg/*
*.orig