changeset 2733:0d9c20d084ca

Fix merge issue.
author andrew
date Mon, 09 Aug 2010 23:51:38 +0100
parents 6fca856c6042
children a094068f4c7b
files src/share/classes/sun/swing/SwingUtilities2.java
diffstat 1 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/swing/SwingUtilities2.java	Mon Aug 09 22:41:21 2010 +0100
+++ b/src/share/classes/sun/swing/SwingUtilities2.java	Mon Aug 09 23:51:38 2010 +0100
@@ -41,13 +41,10 @@
 import javax.swing.text.DefaultHighlighter;
 import javax.swing.text.DefaultCaret;
 import javax.swing.table.TableCellRenderer;
-<<<<<<< local
-=======
 import javax.swing.table.TableColumnModel;
 
 import sun.swing.PrintColorUIResource;
 import sun.swing.ImageIconUIResource;
->>>>>>> other
 import sun.print.ProxyPrintGraphics;
 import sun.awt.*;
 import java.io.*;