X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Fver%2F3.2.4%2Ftimestamp;h=49380b8f9b557984d89f9ad7ba397d47ce9a50e6;hb=03c8e86695218adfbe282a325d23197f3f6b6bfa;hp=0cd7c3295e83d2f25dfad6aba51e9f5c4b580c96;hpb=7294fd3a5724366bd662ace3dbb28a5fbe182943;p=jalview.git

diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 0cd7c32..49380b8 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181111143118 
-=======
-20181111141107 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181120224746