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

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