| Chunk |
|---|
| Conflicting content |
|---|
import android.view.KeyEvent; import android.widget.Toast; import br.ufpb.dce.pa2.pokertable.model.ITable; <<<<<<< HEAD ======= import br.ufpb.dce.pa2.pokertable.model.Player; >>>>>>> 7b3e6010b7929a4c60c6084ab1e7c3e14ba19907 import br.ufpb.dce.pa2.pokertable.model.TableDummy; /** |
| Solution content |
|---|
import android.view.KeyEvent; import android.widget.Toast; import br.ufpb.dce.pa2.pokertable.model.ITable; import br.ufpb.dce.pa2.pokertable.model.TableDummy; /** |
| File |
|---|
| GameActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |
| Chunk |
|---|
| Conflicting content |
|---|
}
public Scene onLoadScene() {
<<<<<<< HEAD
=======
//cria uma mesa de jogo dummy
//mytable = new TableDummy(new Player("Joao", 1000), 20, 2);
>>>>>>> 7b3e6010b7929a4c60c6084ab1e7c3e14ba19907
// cria a cena do jogo
final Scene scene = new Scene();
|
| Solution content |
|---|
}
public Scene onLoadScene() {
// cria a cena do jogo
final Scene scene = new Scene();
|
| File |
|---|
| GameActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
import br.ufpb.dce.pa2.pokertable.model.ITable; import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; <<<<<<< HEAD ======= import br.ufpb.dce.pa2.pokertable.model.Player; import br.ufpb.dce.pa2.pokertable.model.TableDummy; >>>>>>> 7b3e6010b7929a4c60c6084ab1e7c3e14ba19907 /** * Main Activity |
| Solution content |
|---|
import android.widget.Button; import android.widget.EditText; import android.widget.ImageButton; /** * Main Activity |
| File |
|---|
| SelectPlayerActivity.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Import |