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 / timestamp
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 75fd0a4..5bd0bac 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
+20181105193243 
+=======
 20181101233424 
+>>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git