From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Wed, 7 Nov 2018 04:23:56 +0000 (-0600)
Subject: JAL-3026-JAL-3063-JAXB marshalling
X-Git-Tag: Release_2_11_4_0~45^2~18^2~427
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=87a85daad10d3a44b177d5fe91ea9ea81b68d3f9;p=jalview.git

JAL-3026-JAL-3063-JAXB marshalling

JAXB marshalling/unmarshalling successful
JavaScript marshal -> Java unmarshal
JavaScript marshal -> JavaScript unmarshal
Java marshal -> JavaScript unmarshal
---

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index e69de29..cc475bd 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 5bd0bac..ddd7e58 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181105193243 
-=======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181106221821 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index e69de29..cc475bd 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 5bd0bac..ddd7e58 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181105193243 
-=======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181106221821