From 624e8a40e3712c81d3d73586e404f6751487e22a Mon Sep 17 00:00:00 2001
From: diver-sity <li.zhao7@yahoo.com.au>
Date: Wed, 10 Sep 2014 21:23:09 +1000
Subject: [PATCH] modified for working around files created during merge

---
 .gitignore | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.gitignore b/.gitignore
index dc7c7e9c2..da8b19b46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,14 @@
 /nbactions.xml
 .project
 /target
+.classpath
+.idea/
+.settings/
+src/main/main.iml
+*.BACKUP.*.jsp
+*.BASE.*.jsp
+*.LOCAL.*.jsp
+*.REMOTE.*.jsp
+
+
+