X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
index 6d817c3..f4f309c 100644
--- a/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
+++ b/net.sourceforge.phpeclipse.xml.ui/src/net/sourceforge/phpeclipse/xml/ui/internal/compare/XMLMergeViewer.java
@@ -8,11 +8,15 @@
  * Contributors:
  *     Igor Malinin - initial contribution
  *
- * $Id: XMLMergeViewer.java,v 1.1 2004-09-02 18:28:05 jsurfer Exp $
+ * $Id: XMLMergeViewer.java,v 1.2 2005-05-06 00:55:42 stefanbjarni Exp $
  */
 
 package net.sourceforge.phpeclipse.xml.ui.internal.compare;
 
+import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
+import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
+import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
+
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
 import org.eclipse.jface.preference.IPreferenceStore;
@@ -27,10 +31,6 @@ import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.texteditor.AbstractTextEditor;
 
-import net.sourceforge.phpeclipse.xml.ui.XMLPlugin;
-import net.sourceforge.phpeclipse.xml.ui.internal.text.XMLConfiguration;
-import net.sourceforge.phpeclipse.xml.ui.text.XMLTextTools;
-
 /**
  * @author Igor Malinin
  */