Merge branch 'develop' into releases/Release_2_11_2_Branch

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7ca0f00..616d27d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ TESTNG
 /getdown/website
 /getdown/full_app
 /getdown/files
+/getdown/old
 /getdown/src/getdown/*/target/
 /getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Build.java
 /getdown/src/getdown/launcher/dependency-reduced-pom.xml
@@ -39,3 +40,7 @@ TESTNG
 /jalviewjsTest.html
 /site1
 /site2
+/resources/.build_properties
+/resources/channel_properties
+/help/help/html/releases.html
+/help/help/html/whatsNew.html