X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Fver%2F3.2.4%2Ftimestamp;h=1adeb5ae2c3d43f56dad89e1cd3afbf85d00035a;hb=661be8a0871da9a044bb90ad172a937ffa645245;hp=5bd0bacbfadcdca17a808a0c40c84c403637ad44;hpb=20f1e88651d429e7cd49d5b1c76e11278663ac9e;p=jalview.git

diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 5bd0bac..1adeb5a 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181105193243 
-=======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181121181232