merge and add .orig to gitignore

2011-09-03 16:45:09 -04:00 · 2011-09-03 16:45:09 -04:00 · 5baaf8f6e3
parent cd6004fd3d ce6639f44e
commit 5baaf8f6e3
1 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,5 @@
 .bundle
 Gemfile.lock
 pkg/*
 *.orig