Projects >> ceylon-compiler >>762c95001f27e31c6fc5a65bb5be075df9d5275f

Chunk
Conflicting content 
        if ((namingOptions & NA_WRAPPER) != 0) {
            expr = makeQualIdent(expr, getQuotedClassName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
        } else if ((namingOptions & NA_WRAPPER_UNQUOTED) != 0) {
<<<<<<< HEAD
            expr = iors(expr, getRealName(decl, namingOptions & (NA_GETTER | NA_SETTER | NA_WRAPPER_UNQUOTED)));
=======
            expr = makeQualIdent(expr, getRealName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
>>>>>>> 26d1cd1ed31e45b1d0e0f6d5318b4e3f3b41eaa9
        } else if ((namingOptions & NA_Q_LOCAL_INSTANCE) != 0) {
            expr = makeQualIdent(expr, getAttrClassName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
        }
Solution content 
        if ((namingOptions & NA_WRAPPER) != 0) {
            expr = makeQualIdent(expr, getQuotedClassName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
        } else if ((namingOptions & NA_WRAPPER_UNQUOTED) != 0) {
//<<<<<<< HEAD
//            expr = iors(expr, getRealName(decl, namingOptions & (NA_GETTER | NA_SETTER | NA_WRAPPER_UNQUOTED)));
//=======
            expr = makeQualIdent(expr, getRealName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
//>>>>>>> origin/master
        } else if ((namingOptions & NA_Q_LOCAL_INSTANCE) != 0) {
            expr = makeQualIdent(expr, getAttrClassName(decl, namingOptions & (NA_GETTER | NA_SETTER)));
        }
File
Naming.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Variable