From: Roland Häder 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=1bc3bccbbb46dbc289dab272555623cdbd1e506c;p=addressbook-mailer-ejb.git removed navdata as it will be regenerated and ignored it as it always caused merge conflicts Signed-off-by: Roland Häder --- diff --git a/.gitignore b/.gitignore index ee74a86..cf4a7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ -/nbproject/private/ -/nbproject/faces-config.NavData -/nbproject/*~ +nbproject/private/ +nbproject/faces-config.NavData +nbproject/genfiles.properties +nbproject/*~ /manifest.mf /build/ /dist/