Projects information

Chunk

Conflicting content
package tetris; <<<<<<< HEAD public class Board { ======= import java.util.Arrays; /** * @author Esko Luontola */ public class Board implements Grid { >>>>>>> 947faef78a3312c512f1e6283d5bc70a91949cdb private final int rows; private final int columns;

Conflicting content

package tetris;

<<<<<<< HEAD
public class Board {
=======
import java.util.Arrays;

/**
 * @author Esko Luontola
 */
public class Board implements Grid {
>>>>>>> 947faef78a3312c512f1e6283d5bc70a91949cdb

    private final int rows;
    private final int columns;

Solution content
package tetris; public class Board { private final int rows; private final int columns;

File
Board.java

Developer's decision
Version 1

Kind of conflict
Class signature
Comment
Import

Projects >> tdd-tetris-tutorial >>d85bdf418b0c3fa75ca2e3c8794493ec32a96e23