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

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