JAXB upgrade for package-info.java namespace

[jalview.git] / swingjs / timestamp

diff --git a/swingjs/timestamp b/swingjs/timestamp
index d6f548b..170a61e 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< Upstream, based on branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
 20181030183630 
+=======
+20181101060953 
+>>>>>>> 8398157 JAXB upgrade for package-info namespace (only)