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

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