JAL-3362 JAL-3066 patch out not-yet supported thenCompare in slivka ws menu builder

[jalview.git] / swingjs / ver / 3.3.1 / timestamp.orig

diff --git a/swingjs/ver/3.3.1/timestamp.orig b/swingjs/ver/3.3.1/timestamp.orig
new file mode 100644 (file)
index 0000000..e7fc551
--- /dev/null
+++ b/swingjs/ver/3.3.1/timestamp.orig
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+20210728172208 
+=======
+20210720163506 
+>>>>>>> JAL-3878_web_services_overhaul