JAL-3066 remove git conflict file
[jalview.git] / doc / JalviewJS-startupParams.md
2020-06-07 BobHansonJAL-3446 JavaScript interface