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

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