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

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 0cd7c32..54acc81 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
+20181116031148