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

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