Projects >> Haven-and-Hearth-client-modified-by-Ender >>497f3e6da645eb64cbb6ebd38bd8c448c2406805

Chunk
Conflicting content
    }

    public MainFrame(int w, int h) {
<<<<<<< HEAD
	super("Haven and Hearth (modified by Ender v25.03.11)");
=======
	super("Haven and Hearth (modified by Ender v28.03.11)");
>>>>>>> 2a5b266f986eda0c87e7fa10db23f8e6be153b9c
	innerSize = new Dimension(w, h);
	centerPoint = new Point(innerSize.width / 2, innerSize.height / 2);
	p = new HavenPanel(w, h);
Solution content
    }

    public MainFrame(int w, int h) {
	super("Haven and Hearth (modified by Ender v28.03.11)");
	innerSize = new Dimension(w, h);
	centerPoint = new Point(innerSize.width / 2, innerSize.height / 2);
	p = new HavenPanel(w, h);
File
MainFrame.java
Developer's decision
Version 2
Kind of conflict
Method invocation