git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'merge/develop_and_rebase_squashed_merge_JAL-3628+JAL-3608+JAL-3609...
[jalview.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
7ca0f00
..
cd56818
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-39,3
+39,5
@@
TESTNG
/jalviewjsTest.html
/site1
/site2
+/resources/.build_properties
+/resources/channel_properties