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

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