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: Develop-2_11_2_0-d20201215~24^2~68^2~467^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a5af7a36aa6a66935d94ae84c3259db4593de592;hp=1114d77a17494eebd345fe0e908065ec10398f11;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
---

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