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-JAL-3063-JAXB' into trialMerge
[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 eff8cd0..a59b27a 100644 (file)
--- 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
+20180923174836