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

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