1/2 JAL-3253-applet several fixes in SwingJS only:

[jalview.git] / swingjs / timestamp

diff --git a/swingjs/timestamp b/swingjs/timestamp
index 3986ece..618f4c3 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181117143423 
-=======
-20181117133636 
->>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
+20190710094824