From: Daniel Hengeveld <danielwh@gmail.com>
Date: Wed, 19 Dec 2012 22:35:58 +0000 (-0800)
Subject: Merge pull request #463 from michaelminter/patch-1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4f86c33896acea191ea121b61c72612d583e5b1e;p=gitignore.git

Merge pull request #463 from michaelminter/patch-1

add .project files to .gitignore
---

4f86c33896acea191ea121b61c72612d583e5b1e
diff --cc Rails.gitignore
index 7be93a18,d8b22bb2..bf692e15
--- a/Rails.gitignore
+++ b/Rails.gitignore
@@@ -14,4 -13,5 +14,5 @@@ capybara-*.htm
  /spec/tmp/*
  **.orig
  rerun.txt
- pickle-email-*.html
+ pickle-email-*.html
 -.project
++.project