Projects >> tori >>4c287ddf9ded02a4e15b1c53882d83fc37c21ceb

Chunk
Conflicting content 
    };

    private final Map postsToComponents = new HashMap();
<<<<<<< HEAD
    private final CssLayout postsLayout = new CssLayout();
    private ReplyComponent reply;
=======
    private final LazyLayout postsLayout;
>>>>>>> 9d4897a085fbad02238228de1dfae8888fd5b3f2

    public ThreadViewImpl() {
        setStyleName("threadview");
Solution content 
    };

    private final Map postsToComponents = new HashMap();
    private final LazyLayout postsLayout;
    private ReplyComponent reply;

    public ThreadViewImpl() {
        setStyleName("threadview");
File
ThreadViewImpl.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation