X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=swingjs%2Fver%2F3.2.2%2Ftimestamp;h=7770012bb124e4488a7f9ac5cd505fc4524c8915;hb=c46fcf8496996bfd0f0b9087ef879de5af0e9201;hp=eff8cd00f69487e80ec78c6967fe2aa0191dd5a9;hpb=a5af7a36aa6a66935d94ae84c3259db4593de592;p=jalview.git

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