[cp-patches] FYI: Fix ObjectStreamConstants.SC_ENUM merge conflict

[Mark Wielaard]

Hi,

My last commit introduced a double declaration of SC_ENUM in
ObjectStreamConstants. Sorry about that. Fixed as follows:

2006-05-29  Mark Wielaard  <[EMAIL PROTECTED]>

      * java/io/ObjectStreamConstants.java: Removed double declaration
      of SC_ENUM.

Committed,

Mark

--diff -u -r1.16 ObjectStreamConstants.java
--- java/io/ObjectStreamConstants.java  29 May 2006 09:40:48 -0000      1.16
+++ java/io/ObjectStreamConstants.java  29 May 2006 13:40:31 -0000
@@ -200,7 +200,6 @@
    * @since 1.2
    */
   byte SC_BLOCK_DATA = 0x08;
-  byte SC_ENUM = 0x10;

   /**
    * Flag used in <code>ObjectStreamClass</code> to designate that the class
 

signature.asc
Description: This is a digitally signed message part