From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Tue, 21 Aug 2018 18:36:43 +0000 (-0500)
Subject: JAL-3026  GD #118 tooltip not showing for components.
X-Git-Tag: Develop-2_11_2_0-d20201215~24^2~68^2~467
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b2478b4988c4a4cf38f6abc07d9b6dedb2dd731a;hp=a5af7a36aa6a66935d94ae84c3259db4593de592;p=jalview.git

JAL-3026  GD #118 tooltip not showing for components.
---

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index e69de29..b89e608 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index eff8cd0..7770012 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180821132825 
-=======
-20180821131949 
->>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
+20180821142509 
diff --git a/swingjs/ver/3.2.2/SwingJS-site.zip b/swingjs/ver/3.2.2/SwingJS-site.zip
index e69de29..b89e608 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 eff8cd0..7770012 100644
--- a/swingjs/ver/3.2.2/timestamp
+++ b/swingjs/ver/3.2.2/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20180821132825 
-=======
-20180821131949 
->>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git
+20180821142509