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 / timestamp
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 6f6c035..eff8cd0 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20180821132825 
+=======
+20180821131949 
+>>>>>>> branch 'Jalview-BH/JAL-3026' of https://source.jalview.org/git/jalview.git