X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Ftimestamp;h=eff8cd00f69487e80ec78c6967fe2aa0191dd5a9;hb=a5af7a36aa6a66935d94ae84c3259db4593de592;hp=6f6c0359315835c4839eb29aafc64b48680956bc;hpb=3a388a03f5dd2cae5b74e86a23cc528cf5f648c9;p=jalview.git

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 6f6c035..eff8cd0 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20180821132825 
+=======
+20180821131949 
+>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git