Please cherry-pick:

[pizzaservice-ejb.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 50aae3025a87db523e371832c836d370ca0d8ca3..8983685bf689aaf35db7412261df81336e15d41a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,11 @@
 /nbproject/private/
+/nbproject/faces-config.NavData
+/nbproject/genfiles.properties
+/nbproject/*~
 /manifest.mf
 /build/
 /dist/
+/data/*
 /*.properties
-/PizzaService-ejb/build/
-/PizzaService-ejb/dist/
-/PizzaService-ejb/nbproject/private/
-/PizzaService-war/build/
-/PizzaService-war/data/*.*
-/PizzaService-war/dist/
-/PizzaService-war/nbproject/private/
-/PizzaService-war/config.properties
+.~lock*
+.gitcommits