removed navdata as it will be regenerated and ignored it as it always caused merge...

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/.gitignore b/.gitignore
index 51ac39e6f29f103367ad7ef80db8d1f8a7b28ed8..cf4a7c5b0dae6e64df0a9d42472e823cbac70ce2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
-/nbproject/private/
-/nbproject/*~
+nbproject/private/
+nbproject/faces-config.NavData
+nbproject/genfiles.properties
+nbproject/*~
 /manifest.mf
 /build/
 /dist/
 /data/*
 /*.properties
-/*-ejb/nbproject/private/
-/*-ejb/nbproject/*~
-/*-ejb/build/
-/*-ejb/dist/
+.~lock*
+.gitcommits