git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d8d9f50) | patch
JAL-2754 corrected merge conflict
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Nov 2017 08:44:08 +0000 (08:44 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Nov 2017 08:44:08 +0000 (08:44 +0000)
commitce01e81a28859edbdaaaea0e25b13de75ec2e88d
tree509dd7dda723fb5fccd176a3919526a6f915519dtree | snapshot
parentd8d9f50810cf347315bab5b7267416b3e5a8290dcommit | diff
JAL-2754 corrected merge conflict
build.xml diff | blob | history