Merge branch 'bug/JAL-3760_protsTreatedAsNucleotides' into releases/Release_2_11_1_Branch

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index d16c201..1f68613 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 /*.project
 /.classpath
-/.settings/org.eclipse.jdt.core.prefs
+/.settings/*
+!/.settings/org.eclipse.buildship.core.prefs
 /dist
 /clover
 /classes
@@ -28,9 +29,9 @@ TESTNG
 /getdown/src/getdown/core/src/main/java/com/threerings/getdown/data/Build.java
 /getdown/src/getdown/launcher/dependency-reduced-pom.xml
 /utils/install4j/jalview-installers-*.install4j
+/utils/install4j/jalview-install4j-conf.install4j
 *.swp
 /bin
-/doc/building.html
 /.j2s
 /template.html
 /jalviewjsTest.html