From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Tue, 21 Aug 2018 18:30:37 +0000 (-0500)
Subject: Merge branch 'Jalview-BH/JAL-3026' of
X-Git-Tag: Release_2_11_4_0~45^2~18^2~467^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a5af7a36aa6a66935d94ae84c3259db4593de592;p=jalview.git

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

Conflicts:
	swingjs/SwingJS-site.zip
	swingjs/timestamp
	swingjs/ver/3.2.2/SwingJS-site.zip
	swingjs/ver/3.2.2/timestamp
---

a5af7a36aa6a66935d94ae84c3259db4593de592
diff --cc swingjs/SwingJS-site.zip
index 1d44e0d,11c50c2..e69de29
Binary files differ
diff --cc swingjs/timestamp
index 6f6c035,0e6d94b..eff8cd0
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20180821132825 
++=======
+ 20180821131949 
++>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
diff --cc swingjs/ver/3.2.2/SwingJS-site.zip
index 1d44e0d,11c50c2..e69de29
Binary files differ
diff --cc swingjs/ver/3.2.2/timestamp
index 6f6c035,0e6d94b..eff8cd0
--- a/swingjs/ver/3.2.2/timestamp
+++ b/swingjs/ver/3.2.2/timestamp
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +20180821132825 
++=======
+ 20180821131949 
++>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git