ICU-5805 Clean up edit of conflict.
X-SVN-Rev: 22183
This commit is contained in:
parent
ec96ec8a87
commit
358e8beee3
@ -3,9 +3,8 @@
|
|||||||
* Copyright (C) 2006-2007, International Business Machines Corporation and *
|
* Copyright (C) 2006-2007, International Business Machines Corporation and *
|
||||||
* others. All Rights Reserved. *
|
* others. All Rights Reserved. *
|
||||||
*******************************************************************************
|
*******************************************************************************
|
||||||
*
|
|
||||||
*******************************************************************************
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.ibm.icu.charset;
|
package com.ibm.icu.charset;
|
||||||
|
|
||||||
import java.nio.BufferOverflowException;
|
import java.nio.BufferOverflowException;
|
||||||
|
Loading…
Reference in New Issue
Block a user