Projects >> jOOQ >>4a279450d50028acfcaa074c8abb789071d2d592

Chunk
Conflicting content 
    CONDITION_NOT_BETWEEN_SYMMETRIC,

    /**
<<<<<<< HEAD
=======
     * A DISTINCT condition.
     * 

     * This clause surrounds two {@link #FIELD} clauses.
     */
    CONDITION_IS_DISTINCT,

    /**
     * A NOT DISTINCT condition.
     * 

     * This clause surrounds two {@link #FIELD} clauses.
     */
    CONDITION_IS_NOT_DISTINCT,

    /**
>>>>>>> a79b7bfeb08ecfa80d6884c38d22c89cb86e64f2
     * An OVERLAPS condition.
     * 

     * This clause surrounds two {@link #FIELD} clauses.
Solution content 
    CONDITION_NOT_BETWEEN_SYMMETRIC,

    /**
     * An OVERLAPS condition.
     * 

     * This clause surrounds two {@link #FIELD} clauses.
File
Clause.java
Developer's decision
Version 1
Kind of conflict
Comment
Enum value