git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa7e98d 24a67e0)
Merge branch 'develop' into bug/JAL-3753_resources_duplicated_in_jalview_jar
authorBen Soares <b.soares@dundee.ac.uk>
Mon, 28 Sep 2020 11:12:47 +0000 (12:12 +0100)
committerBen Soares <b.soares@dundee.ac.uk>
Mon, 28 Sep 2020 11:12:47 +0000 (12:12 +0100)
1  2 
build.gradle patch | diff1 | diff2 | blob | history
gradle.properties patch | diff1 | diff2 | blob | history

diff --cc build.gradle
Simple merge
diff --cc gradle.properties
Simple merge