git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-3026-JAL-3063 menu fonts
[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 99e7c15..3986ece 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
+20181117143423 
+=======
 20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git