Projects >> Custom-Salem >>771eab7548fb71a33021fce078b139660d939992

Chunk
Conflicting content 
    public Widget mouseon;
    public Console cons = new WidgetConsole();
    private Collection afterdraws = new LinkedList();
<<<<<<< HEAD
    public MenuGrid mnu;
=======
    public final ActAudio audio = new ActAudio();
>>>>>>> c8c9e28f4e5a2f21f15297e9f1f0cf8e32017270
    
    {
	lastevent = lasttick = System.currentTimeMillis();
Solution content 
    public Widget mouseon;
    public Console cons = new WidgetConsole();
    private Collection afterdraws = new LinkedList();
    public MenuGrid mnu;
    public final ActAudio audio = new ActAudio();
    
    {
	lastevent = lasttick = System.currentTimeMillis();
File
UI.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
	       (modsuper?8:0));
    }

<<<<<<< HEAD
    public void message(String str) {
	if((cons!=null) && (gui!=null)){
//	    cons.out.println(str);
	    gui.error(str);
	}
=======
    public void destroy() {
	audio.clear();
>>>>>>> c8c9e28f4e5a2f21f15297e9f1f0cf8e32017270
    }
}
Solution content 
	       (modsuper?8:0));
    }

    public void message(String str) {
	if((cons!=null) && (gui!=null)){
//	    cons.out.println(str);
	    gui.error(str);
	}
    }

    public void destroy() {
	audio.clear();
    }
}
File
UI.java
Developer's decision
Concatenation
Kind of conflict
If statement
Method invocation
Method signature