Projects >> shade >>d1df9791f988d6dd7c492a2a38063f723cb958b5

Chunk
Conflicting content 
import org.newdawn.slick.state.StateBasedGame;

import com.shade.controls.DayPhaseTimer;
<<<<<<< HEAD
import com.shade.entities.Basket;
import com.shade.entities.MockPlayer;
=======
>>>>>>> 7be8b365bb1173fd2c7298e1b6972ea262edad3f
import com.shade.entities.mushroom.MushroomFactory;
import com.shade.lighting.GlobalLight;
import com.shade.lighting.LuminousEntity;
Solution content 
import org.newdawn.slick.state.StateBasedGame;

import com.shade.controls.DayPhaseTimer;
import com.shade.entities.mushroom.MushroomFactory;
import com.shade.lighting.GlobalLight;
import com.shade.lighting.LuminousEntity;
File
Level0.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        dayTimer = new DayPhaseTimer(SECONDS_PER_DAY);
        light = new GlobalLight(12, (float) (4 * Math.PI / 3),
                SECONDS_PER_DAY,dayTimer);
<<<<<<< HEAD

        add(new MockPlayer(450, 300));
        add(new Basket(400, 250, 65, 40));

=======
>>>>>>> 7be8b365bb1173fd2c7298e1b6972ea262edad3f
        LevelSerial l = new LevelSerial();
        for (LuminousEntity e : l.deserialize("levels/level-0.xml")) {
            add(e);
Solution content 
        dayTimer = new DayPhaseTimer(SECONDS_PER_DAY);
        light = new GlobalLight(12, (float) (4 * Math.PI / 3),
                SECONDS_PER_DAY,dayTimer);
       LevelSerial l = new LevelSerial();
        for (LuminousEntity e : l.deserialize("levels/level-0.xml")) {
            add(e);
File
Level0.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.newdawn.slick.state.StateBasedGame;

import com.shade.controls.DayPhaseTimer;
<<<<<<< HEAD
import com.shade.entities.Basket;
import com.shade.entities.MockPlayer;
import com.shade.entities.Player;
=======
>>>>>>> 7be8b365bb1173fd2c7298e1b6972ea262edad3f
import com.shade.entities.mushroom.MushroomFactory;
import com.shade.lighting.GlobalLight;
import com.shade.lighting.LuminousEntity;
Solution content 
import org.newdawn.slick.state.StateBasedGame;

import com.shade.controls.DayPhaseTimer;
import com.shade.entities.mushroom.MushroomFactory;
import com.shade.lighting.GlobalLight;
import com.shade.lighting.LuminousEntity;
File
Level1.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        dayTimer = new DayPhaseTimer(SECONDS_PER_DAY);
        light = new GlobalLight(12, (float) (4 * Math.PI / 3),
                SECONDS_PER_DAY,dayTimer);
<<<<<<< HEAD

        add(new MockPlayer(450, 300));
        add(new Basket(400, 250, 65, 40));

=======
        
>>>>>>> 7be8b365bb1173fd2c7298e1b6972ea262edad3f
        LevelSerial l = new LevelSerial();
        for (LuminousEntity e : l.deserialize("levels/level-1.xml")) {
            add(e);
Solution content 
        dayTimer = new DayPhaseTimer(SECONDS_PER_DAY);
        light = new GlobalLight(12, (float) (4 * Math.PI / 3),
                SECONDS_PER_DAY,dayTimer);
        LevelSerial l = new LevelSerial();
        for (LuminousEntity e : l.deserialize("levels/level-1.xml")) {
            add(e);
File
Level1.java
Developer's decision
Version 2
Kind of conflict
Method invocation