Projects >> apptentive-android >>aef2188f5f154a22a974ccbd5bd62ffc1297d0b5

Chunk
Conflicting content 
				AboutModule.getInstance().doShow(this);
				break;
			case MESSAGE_CENTER:
<<<<<<< HEAD
				break;
			case MESSAGE_CENTER_ERROR:
=======
				((MessageCenterActivityContent)activityContent).onStart();
				super.onStart();
>>>>>>> f89b17169bafa42f798c2e07a950cdc4a8530131
				break;
			case INTERACTION:
				// Interactions are already set up from onCreate().
Solution content 
				AboutModule.getInstance().doShow(this);
				break;
			case MESSAGE_CENTER:
				((MessageCenterActivityContent) activityContent).onStart();
				super.onStart();
				break;
			case MESSAGE_CENTER_ERROR:
				super.onStart();
				break;
			case INTERACTION:
				// Interactions are already set up from onCreate().
File
ViewActivity.java
Developer's decision
Manual
Kind of conflict
Break statement
Case statement
Method invocation
Chunk
Conflicting content 
	private static final String KEY_MESSAGE_CENTER_BG_POLL = "bg_poll";
	private static final String KEY_MESSAGE_CENTER_ENABLED = "message_center_enabled";
	private static final String KEY_MESSAGE_CENTER_EMAIL_REQUIRED = "email_required";
<<<<<<< HEAD
	private static final String KEY_MESSAGE_CENTER_GREETING_IMAGE_URL= "greeting_image_url";

=======
	private static final String KEY_NEW_MESSAGE_TOAST_ENABLED = "new_message_toast_enabled";
>>>>>>> f89b17169bafa42f798c2e07a950cdc4a8530131
	private static final String KEY_HIDE_BRANDING = "hide_branding";

	// This one is not sent in JSON, but as a header form the server.
Solution content 
	private static final String KEY_MESSAGE_CENTER_BG_POLL = "bg_poll";
	private static final String KEY_MESSAGE_CENTER_ENABLED = "message_center_enabled";
	private static final String KEY_MESSAGE_CENTER_EMAIL_REQUIRED = "email_required";
	private static final String KEY_MESSAGE_CENTER_GREETING_IMAGE_URL= "greeting_image_url";
	private static final String KEY_NEW_MESSAGE_TOAST_ENABLED = "new_message_toast_enabled";
	private static final String KEY_HIDE_BRANDING = "hide_branding";

	// This one is not sent in JSON, but as a header form the server.
File
Configuration.java
Developer's decision
Concatenation
Kind of conflict
Attribute