Merge branch 'task/JAL-3805_Remove_Uninstall_Old_Jalview_application_for_develop_bran...

[jalview.git] / swingjs / timestamp

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