git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'Jalview-BH/JAL-3026' of
[jalview.git] / swingjs / ver / 3.2.2 / timestamp
diff --git a/swingjs/ver/3.2.2/timestamp b/swingjs/ver/3.2.2/timestamp
index 0e6d94b..eff8cd0 100644 (file)
--- 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