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

diff --git a/swingjs/timestamp b/swingjs/timestamp
index c6e3a90..3986ece 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
-20181114223438 
+<<<<<<< HEAD
+20181117143423 
+=======
+20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git