Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
[jalview.git] / .gitignore
index 1f68613..7ca0f00 100644 (file)
@@ -18,6 +18,8 @@ TESTNG
 /benchmarking/lib
 *.class
 /site
+/site-resources
+/libjs
 /.gradle
 /build
 /local.properties
@@ -37,4 +39,3 @@ TESTNG
 /jalviewjsTest.html
 /site1
 /site2
-/resources/.build_properties