JAL-3077 broken conflict resolve resulted in failing test (nb - still not resolved...
authorJames Procter <j.procter@dundee.ac.uk>
Fri, 10 Feb 2023 17:05:30 +0000 (17:05 +0000)
committerJames Procter <j.procter@dundee.ac.uk>
Fri, 10 Feb 2023 17:05:30 +0000 (17:05 +0000)
commit421c0cd3daea00db58f42af499c8415608fb0aaa
tree1ca347e10d5fa5580acc9da4d4360481f76a05ba
parente7623d0a250b5d4908c45d50f52a78be4e339ce7
JAL-3077 broken conflict resolve resulted in failing test (nb - still not resolved the issue of (promoted) dbrefs!)
test/jalview/ws/dbsources/UniprotTest.java