X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=81a6aebe3afb62610b7c2983a8f6bda63f6baa3d;hb=62dfc89f5222d6a6ef827b46484f48846a7af9bf;hp=5bd0bacbfadcdca17a808a0c40c84c403637ad44;hpb=20f1e88651d429e7cd49d5b1c76e11278663ac9e;p=jalview.git

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