X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=swingjs%2Ftimestamp;fp=swingjs%2Ftimestamp;h=0cd7c3295e83d2f25dfad6aba51e9f5c4b580c96;hp=f5785d8e331b69e506ae2468c9affbccd2b2c175;hb=7294fd3a5724366bd662ace3dbb28a5fbe182943;hpb=f03b7f83651d88945df5399a4e5a3e1848293463

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