Merge branch 'feature/JAL-4159_pasimap' into develop

[jalview.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 59c4a99..2b5afa3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,10 +13,14 @@
 .DS_Store
 /.com.apple.timemachine.supported
 .gitattributes
+.gitignore
 TESTNG
 /jalviewApplet.jar
 /benchmarking/lib
 *.class
+*.patch
+*.diff
+*.orig
 /site
 /site-resources
 /libjs