Projects >> Haven-and-Hearth-client-modified-by-Ender >>c7c0b43febdf99f25b7533aab94a45d0382f1173

Chunk
Conflicting content
import java.awt.Graphics;
import java.awt.image.BufferedImage;

<<<<<<< HEAD
public class Resource implements Comparable, Serializable {
=======
public class Resource implements Comparable, Prioritized, Serializable {
	private static File basedir = new File("Y:\\res");
>>>>>>> f0c8428cc6515b54566a79987a35dd14850d2e5a
	public static URL baseurl = null;
	private static Map cache = new TreeMap();
	private static Loader loader;
Solution content
import java.awt.Graphics;
import java.awt.image.BufferedImage;

public class Resource implements Comparable, Prioritized, Serializable {
	public static URL baseurl = null;
	private static Map cache = new TreeMap();
	private static Loader loader;
File
Resource.java
Developer's decision
Combination
Kind of conflict
Attribute
Class signature
Method invocation