Projects >> yeti >>cdac7a112f4ca54efb5ebf41b065da3ecea1c0fc

Chunk
Conflicting content 
            }
            return res;
        }
<<<<<<< HEAD
=======

        String doc() {
            for (Type t = this; t != null; t = t.ref)
                if (t.doc != null) {
                    t.doc = t.doc.trim();
                    if (doc.length() != 0)
                        return doc;
                    t.doc = null;
                }
            return null;
        }
>>>>>>> 55f28de04e285786d530f409627c28a803613709
    }

    static Type mutableFieldRef(Type src) {
Solution content 
            }
            return res;
        }

        String doc() {
            for (Type t = this; t != null; t = t.ref)
                if (t.doc != null) {
                    t.doc = t.doc.trim();
                    if (doc.length() != 0)
                        return doc;
                    t.doc = null;
                }
            return null;
        }
    }

    static Type mutableFieldRef(Type src) {
File
YetiType.java
Developer's decision
Version 2
Kind of conflict
Method declaration