Projects >> open2jam >>a86403b4a79e712bfe9fb7ede1fd809505577ed6

Chunk
Conflicting content 
import java.awt.image.BufferedImage;
import java.net.URL;
<<<<<<< HEAD
import java.util.ArrayDeque;
import java.util.Collections;
=======
>>>>>>> f1ea0f3a22e71eaa52d2278d86f240aa9ed94700
import java.util.Map;
import java.util.EnumMap;
import java.util.HashMap;
Solution content 
import java.awt.image.BufferedImage;
import java.net.URL;
import java.util.ArrayDeque;
import java.util.Collections;
import java.util.Map;
import java.util.EnumMap;
import java.util.HashMap;
File
Render.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
                entities_matrix.add(judgment_entity);

		note_counter.get(judge).incNumber();
<<<<<<< HEAD
                ranking_entity.addNumber(computeRanking(judge));
                if(judge.equals("JUDGMENT_COOL"))
                    jamcombo_counter += 2;
                else if(judge.equals("JUDGMENT_GOOD"))
                    jamcombo_counter++;
                else
                {
                    jamcombo_counter = 0;
                    jamcombo_entity.resetNumber();
                }
		if(ne.getHit() > 0) // TODO: compare with MISS ?
=======
		if(judge.equals(MISS_JUDGE))
>>>>>>> f1ea0f3a22e71eaa52d2278d86f240aa9ed94700
                {
		    Entity ee = skin.getEntityMap().get("EFFECT_CLICK_1").copy();
		    ee.setPos(ne.getX()+ne.getWidth()/2-ee.getWidth()/2,
Solution content 
                entities_matrix.add(judgment_entity);

		note_counter.get(judge).incNumber();
                ranking_entity.addNumber(computeRanking(judge));
                if(judge.equals("JUDGMENT_COOL"))
                    jamcombo_counter += 2;
                else if(judge.equals("JUDGMENT_GOOD"))
                    jamcombo_counter++;
                else
                {
                    jamcombo_counter = 0;
                    jamcombo_entity.resetNumber();
                }
		if(ne.getHit() > 0) // TODO: compare with MISS ?
                {
		    Entity ee = skin.getEntityMap().get("EFFECT_CLICK_1").copy();
		    ee.setPos(ne.getX()+ne.getWidth()/2-ee.getWidth()/2,
File
Render.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation