# HG changeset patch # User Jaroslav Tulach # Date 1360160399 -3600 # Node ID c668c83507ee661a6335d9c0408088ea909d932f # Parent 985535d06cb3e0105ec932d489ccbbaafae62dce Fixing the code after merge diff -r 985535d06cb3 -r c668c83507ee emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java --- a/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java Wed Feb 06 15:10:22 2013 +0100 +++ b/emul/mini/src/main/java/org/apidesign/bck2brwsr/emul/lang/System.java Wed Feb 06 15:19:59 2013 +0100 @@ -53,8 +53,4 @@ } @JavaScriptBody(args = { "obj" }, body="return vm.java_lang_Object(false).hashCode__I.call(obj);") public static native int identityHashCode(Object obj); - - public static long nanoTime() { - return 1000L * currentTimeMillis(); - } }