Merge remote-tracking branch 'refs/remotes/origin/master'

[mdref/mdref] / .gitignore

diff --git a/.gitignore b/.gitignore
index 1d3e81325d0ad1fcb47f9e1995c6648c7d0e4414..40b7eda78c8e121dc3a93eb1a2ec7e0f99f2f12c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-geany_run_script.sh
+/nbproject/