From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sat, 17 Nov 2018 21:00:38 +0000 (-0600)
Subject: JAL-3026-JAL-3063 Menu font line spacing fix
X-Git-Tag: Release_2_11_4_0~45^2~18^2~390
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=20ba323be7d9f525ece92bdce056e020dc81f993;p=jalview.git

JAL-3026-JAL-3063 Menu font line spacing fix
---

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index 8f0c45d..b76176f 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 3986ece..0706bff 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20181117145755 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index 8f0c45d..b76176f 100644
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 3986ece..0706bff 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20181117145755