X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=3986ecef9aab9b307191b0684f2170b7a8dcef73;hb=92de0afb8f650e19b64cbddfa8c32b1119737a8b;hp=5bd0bacbfadcdca17a808a0c40c84c403637ad44;hpb=20f1e88651d429e7cd49d5b1c76e11278663ac9e;p=jalview.git

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 5bd0bac..3986ece 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1,5 @@
 <<<<<<< HEAD
-20181105193243 
+20181117143423 
 =======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git