changeset 7569:2cef4a93bcb8 icedtea-2.5pre04

Fix merge duplication in com.sun.script.javascript.RhinoTopLevel
author andrew
date Thu, 17 Apr 2014 22:51:43 +0100
parents 18b79b346c2c
children 6cb22bfdd98b
files src/share/classes/com/sun/script/javascript/RhinoTopLevel.java
diffstat 1 files changed, 0 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;