From d78a2d9dad98517ccd11e7e9602545233d5586ea Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Sat, 12 Nov 2016 18:05:31 -0800
Subject: [PATCH] GUACAMOLE-119: Move NetBeans-specific .gitignore entries to
 guacamole project.

---
 .gitignore           | 2 --
 guacamole/.gitignore | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b82b2caa7..bcc52fede 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,2 @@
 *~
 target/
-nb-configuration.xml
-guacamole/customs.json
diff --git a/guacamole/.gitignore b/guacamole/.gitignore
index 1b2666e16..104d9234b 100644
--- a/guacamole/.gitignore
+++ b/guacamole/.gitignore
@@ -1,4 +1,6 @@
 src/main/webapp/META-INF/
 src/main/webapp/generated/
+nb-configuration.xml
+customs.json
 target/
 *~