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' of
[jalview.git] / swingjs / ver / 3.2.4 / timestamp
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index d1276fe..0cd7c32 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1,5 @@
-20181101203541 
+<<<<<<< HEAD
+20181111143118 
+=======
+20181111141107 
+>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git