Merge branch 'hanson1' of https://github.com/BobHanson/java2script.git

hansonr · hansonr · commit 053bc55b1a29 · 2018-11-17T14:36:38.000-06:00
into hanson1
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20181117143423 
+=======
+20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.4/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20181117143423 
+=======
+20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
