Projects >> shade >>b0d1fe4176f42ad9b3dbde7ff1005d39f86600c9

Chunk
Conflicting content 
public class PlayerSparkler {
	public static final float MAX_SCALEUP = 0.5f;
<<<<<<< HEAD
	public static final float increment = 0.0008f;
=======
	public static final float increment = 0.002f;
>>>>>>> 17eab430f62d0b41d0ca3625958447e1331dae32

	private ArrayList sparkles;
	// the lovely source of sparkliness
Solution content 
public class PlayerSparkler {
	public static final float MAX_SCALEUP = 0.5f;
	public static final float increment = 0.002f;

	private ArrayList sparkles;
	// the lovely source of sparkliness
File
PlayerSparkler.java
Developer's decision
Version 2
Kind of conflict
Attribute