First try at merging didn't go so well.
authorBobHanson <hansonr@stolaf.edu>
Thu, 11 Jun 2020 12:19:17 +0000 (07:19 -0500)
committerBobHanson <hansonr@stolaf.edu>
Thu, 11 Jun 2020 12:19:17 +0000 (07:19 -0500)
commit2d1266a962258b42850b386095bd076d6fbfaf61
treec652264001d7ac33a2f4118f5ab8535cc1a07237
parentae737f35e5185aa421563e4c061340a3c4152514
First try at merging didn't go so well.
src/jalview/gui/Desktop.java
src/jalview/util/Platform.java