From dacc26cf75200d97817b0a04a880fbdd0c100e17 Mon Sep 17 00:00:00 2001
From: Oliver Gierke <info@olivergierke.de>
Date: Fri, 15 Jul 2011 10:08:38 +0200
Subject: [PATCH] Updated .gitignore.

Now ignoring .settings folder, .project, .classpath and files ending on .orig (usually originating from resolved merge conflicts).
---
 .gitignore | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7e3ded087..ad31e2409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
-target
+target/
+.settings/
+.project
+.classpath
+*.orig
 .springBeans
 .ant-targets-build.xml
 src/ant/.ant-targets-upload-dist.xml