Projects >> Poker-Table >>00dd2055d65fdb1e767b1de001e2ae71376f49ae

Chunk
Conflicting content 
import org.anddev.andengine.opengl.texture.region.TextureRegion;
import org.anddev.andengine.ui.activity.BaseGameActivity;

<<<<<<< HEAD
import br.ufpb.dce.pa2.pokertable.game.util.SoundManager;
import br.ufpb.dce.pa2.pokertable.game.view.scenes.R.button;

=======
>>>>>>> f029adb8ced9ba8f97bd2ea86c4d0f282212c583
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
Solution content 
import org.anddev.andengine.opengl.texture.region.TextureRegion;
import org.anddev.andengine.ui.activity.BaseGameActivity;

import br.ufpb.dce.pa2.pokertable.game.util.SoundManager;
import br.ufpb.dce.pa2.pokertable.game.view.scenes.R.button;

import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
File
GameActivity.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
	private TextureRegion mPlayerRegion;
	private BitmapTextureAtlas mPlayerTexture;

<<<<<<< HEAD
=======
	private Boolean sair;
	
	//Atributos relacionados a logica do jogo
	private ITable mytable;

>>>>>>> f029adb8ced9ba8f97bd2ea86c4d0f282212c583
	// carrega a engine
	public Engine onLoadEngine() {
Solution content 
	private TextureRegion mPlayerRegion;
	private BitmapTextureAtlas mPlayerTexture;

	private Boolean sair;
	
	//Atributos relacionados a logica do jogo
	private ITable mytable;

	// carrega a engine
	public Engine onLoadEngine() {
File
GameActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment