/hg/release/icedtea7-forest-2.5/jdk: Fix merge duplication in co...

[andrew at icedtea.classpath.org]

changeset 2cef4a93bcb8 in /hg/release/icedtea7-forest-2.5/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.5/jdk?cmd=changeset;node=2cef4a93bcb8
author: andrew
date: Thu Apr 17 22:51:43 2014 +0100

	Fix merge duplication in com.sun.script.javascript.RhinoTopLevel


diffstat:

 src/share/classes/com/sun/script/javascript/RhinoTopLevel.java |  1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diffs (11 lines):

diff -r 18b79b346c2c -r 2cef4a93bcb8 src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
--- a/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Thu Apr 17 17:52:33 2014 +0100
+++ b/src/share/classes/com/sun/script/javascript/RhinoTopLevel.java	Thu Apr 17 22:51:43 2014 +0100
@@ -26,7 +26,6 @@
 package com.sun.script.javascript;
 
 import sun.org.mozilla.javascript.internal.*;
-import java.security.AccessControlContext;
 import javax.script.*;
 import java.security.AccessControlContext;