X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=swingjs%2Fver%2F3.2.4%2Ftimestamp;h=b0c15a382c17575435de614ad8ac40b75cbf7145;hb=15cc82b1969458c5ecd13160fb8d1a60773df2b5;hp=3986ecef9aab9b307191b0684f2170b7a8dcef73;hpb=92de0afb8f650e19b64cbddfa8c32b1119737a8b;p=jalview.git

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