ICU-5805 Clean up edit of conflict.

X-SVN-Rev: 22183
2007-07-27 20:01:11 +00:00 · 2007-07-27 20:01:11 +00:00 · 358e8beee3
commit 358e8beee3
parent ec96ec8a87
1 changed files with 1 additions and 2 deletions
--- a/icu4j/src/com/ibm/icu/charset/Charset88591.java
+++ b/icu4j/src/com/ibm/icu/charset/Charset88591.java
@ -3,9 +3,8 @@
 * Copyright (C) 2006-2007, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
- *
- *******************************************************************************
 */
+
 package com.ibm.icu.charset;

 import java.nio.BufferOverflowException;