JAL-952 fixed unresolved conflict breaking build
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 12:30:26 +0000 (13:30 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 4 Jun 2014 14:21:35 +0000 (15:21 +0100)
commitf82eb8cf80395423612005013b2f1e072931b7fa
treeefac3a56da1ff337d4d737db41a0673a68d25ba4
parent8b985fad9a206fb678e8f84f65a1659c00e49d93
JAL-952 fixed unresolved conflict breaking build
src/jalview/schemes/ColourSchemeProperty.java