From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 22 Jun 2018 13:49:22 +0000 (+0100)
Subject: Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git... 
X-Git-Tag: Release_2_11_4_0~45^2~18^2~661^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=628abf41b8573c7eb97b17656ba49bda6919c181;p=jalview.git

Merge branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026
---

628abf41b8573c7eb97b17656ba49bda6919c181
diff --cc src/jalview/bin/JalviewJS.java
index 1d8ef62,a26e182..3fff67d
--- a/src/jalview/bin/JalviewJS.java
+++ b/src/jalview/bin/JalviewJS.java
@@@ -3,9 -3,7 +3,8 @@@ package jalview.bin
  import jalview.analysis.AlignmentUtils;
  import jalview.datamodel.AlignmentI;
  import jalview.gui.AlignFrame;
 +import jalview.gui.Desktop;
  import jalview.gui.SplitFrame;
- import jalview.io.AppletFormatAdapter;
  import jalview.io.DataSourceType;
  import jalview.io.FileFormatException;
  import jalview.io.FileFormatI;