git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 496e2a7) | patch
Resolve properties file merge conflict with develop
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 15:39:27 +0000 (16:39 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Mon, 1 May 2017 15:39:27 +0000 (16:39 +0100)
commit6b560f7df25c0f8157531243fb461eb7ead76ab6
tree7bdb940f8e51f07a5771cd663c705588695c4273tree | snapshot
parent496e2a7b7be5201d8739523b95fce5899e71aa8acommit | diff
Resolve properties file merge conflict with develop
resources/lang/Messages.properties diff | blob | history