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

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