java2script
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
-1.28 MB b/‎sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip‎
-1.28 MB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 4 additions & 0 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/timestamp‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip‎
-1.27 MB b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/SwingJS-site.zip‎
-1.27 MB
diff --git a/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp‎
Lines changed: 4 additions & 0 deletions b/‎sources/net.sf.j2s.core/dist/swingjs/ver/3.2.2/timestamp‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
-4 MB b/‎sources/net.sf.j2s.java.core/dist/SwingJS-site.zip‎
-4 MB
diff --git a/‎sources/net.sf.j2s.java.core/srcjs/swingjs2.js‎
Lines changed: 3 additions & 0 deletions b/‎sources/net.sf.j2s.java.core/srcjs/swingjs2.js‎
Lines changed: 3 additions & 0 deletions
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20180820100423 
+=======
+20180819230621 
+>>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
@@ -1 +1,5 @@
+<<<<<<< HEAD
 20180820100423 
+=======
+20180819230621 
+>>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
@@ -13462,7 +13462,10 @@ if (!J2S._version)
 // TODO: CharacterSequence does not implement Java 8 default methods chars() or codePoints()
 //       It is possible that these might be loaded dynamically.
 
+<<<<<<< HEAD
 // BH 8/20/2017 3.2.2.04 adds character.isJavaIdentifierPart$C
+=======
+>>>>>>> branch 'yadav1' of https://github.com/BobHanson/java2script.git
 // BH 8/19/2017 3.2.2.04 fixes Enum .name being .$name
 // BH 8/16/2018 3.2.2.04 fixes Character.toTitleCase$C, [Integer,Long,Short,Byte].toString(i,radix)
 // BH 8/13/2018 3.2.2.04 $finals to $finals$ -- basically variables are $xxx, methods are xxx$, and special values are $xxx$