Projects >> runnersHigh >>ca4ebe9e5ef039ccbb78894b79d86b7f14649e51

Chunk
Conflicting content
			player = new Player(getApplicationContext(), mRenderer, height);
			
<<<<<<< HEAD
			if(Settings.RHDEBUG)
				Log.d("debug", "after player creation");

			// Loading Toast
			loadMessage = Toast.makeText(context, "Fat guys need longer ...", 4000 );
			loadMessage.setGravity(Gravity.CENTER|Gravity.CENTER, 0, 0);
			
=======
>>>>>>> 4dcca9d16b8200ec1236480affe725d91edc5bc1
			loadingDialog = new ProgressDialog( context );
		    loadingDialog.setProgressStyle(0);
		    loadingDialog.setMessage("Loading Highscore ...");
Solution content
			player = new Player(getApplicationContext(), mRenderer, height);
			
			if(Settings.RHDEBUG)
				Log.d("debug", "after player creation");
			loadingDialog = new ProgressDialog( context );
		    loadingDialog.setProgressStyle(0);
		    loadingDialog.setMessage("Loading Highscore ...");
File
main.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
If statement
Method invocation