From: Roland Häder <roland@mxchange.org>
Date: Sun, 16 Apr 2017 09:52:10 +0000 (+0200)
Subject: removed navdata as it will be regenerated and ignored it as it always caused merge... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=efac9bd9f80265eaa0b7b3f560cea0906dfaa82b;p=addressbook.git

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

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

diff --git a/.gitignore b/.gitignore
index 8b1fab4..cf4a7c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,11 @@
-/nbproject/private/
-/nbproject/*~
+nbproject/private/
+nbproject/faces-config.NavData
+nbproject/genfiles.properties
+nbproject/*~
 /manifest.mf
 /build/
 /dist/
 /data/*
-/*/*/.~lock*
 /*.properties
-/*-ejb/nbproject/private/
-/*-ejb/nbproject/*~
-/*-ejb/build/
-/*-ejb/dist/
+.~lock*
+.gitcommits