X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=swingjs%2Fver%2F3.2.4%2Ftimestamp;h=0706bffaf9480bee48303c640e2dc7fc698c5a46;hp=3986ecef9aab9b307191b0684f2170b7a8dcef73;hb=20ba323be7d9f525ece92bdce056e020dc81f993;hpb=92de0afb8f650e19b64cbddfa8c32b1119737a8b

diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 3986ece..0706bff 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
+20181117145755