JAL-3210 Added a flag to skip transpile errors, now like in Eclipse IDE. Will want...

[jalview.git] / swingjs / timestamp

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