diff --git a/.gitignore b/.gitignore index 927255112..fb9eb761f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,8 +5,8 @@ # netbeans /nbproject -/nbactions.xml -/nb-configuration.xml +nbactions.xml +nb-configuration.xml # we use maven! /build.xml diff --git a/proxy/nb-configuration.xml b/proxy/nb-configuration.xml deleted file mode 100644 index c2decf16f..000000000 --- a/proxy/nb-configuration.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - JDK_1.7 - -