From 440eba08998ecc7013482bd6d337938da1024034 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 16 Apr 2017 11:52:08 +0200 Subject: [PATCH] removed navdata as it will be regenerated and ignored it as it always caused merge conflicts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .gitignore | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 67bceb8..cf4a7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,11 @@ -/nbproject/private/ -/nbproject/faces-config.NavData -/nbproject/genfiles.properties -/nbproject/*~ +nbproject/private/ +nbproject/faces-config.NavData +nbproject/genfiles.properties +nbproject/*~ /manifest.mf /build/ /dist/ /data/* /*.properties .~lock* -*.tmp .gitcommits -- 2.39.5