From: Roland Häder <roland@mxchange.org>
Date: Sun, 16 Apr 2017 09:52:09 +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=30b751c59376caa49d560a798c22460c7c7e904c;p=jshop-core.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 1653e82..cf4a7c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +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
-