Projects >> socialbike >>7ea4ab7b84aac877030a8c70810ae3d18660b470

Chunk
Conflicting content 
	private boolean mPermissionRequestPending;

	private Button lockButton;
<<<<<<< HEAD
	// private Button pollShackle;
=======
//	private Button pollShackle;
>>>>>>> ed749b18651bae37d25631bf822f96f57334145b
	private boolean locked;

	private String key;
Solution content 
	private boolean mPermissionRequestPending;

	private Button lockButton;
//	private Button pollShackle;
	private boolean locked;

	private String key;
File
SocialBikeActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
		setContentView(R.layout.main);
		lockButton = (Button) findViewById(R.id.toggleLock);
		lockButton.setOnClickListener(this);
<<<<<<< HEAD
		// pollShackle = (Button) findViewById(R.id.pollShackle);
		// pollShackle.setOnClickListener(this);
=======
//		pollShackle = (Button) findViewById(R.id.pollShackle);
//		pollShackle.setOnClickListener(this);
>>>>>>> ed749b18651bae37d25631bf822f96f57334145b
	}

	@Override
Solution content 
		setContentView(R.layout.main);
		lockButton = (Button) findViewById(R.id.toggleLock);
		lockButton.setOnClickListener(this);
//		pollShackle = (Button) findViewById(R.id.pollShackle);
//		pollShackle.setOnClickListener(this);
	}

	@Override
File
SocialBikeActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
	private void toggleControls(boolean enabled) {
		lockButton.setEnabled(enabled);
<<<<<<< HEAD
		// pollShackle.setEnabled(enabled);
=======
//		pollShackle.setEnabled(enabled);
>>>>>>> ed749b18651bae37d25631bf822f96f57334145b
	}

	/**
Solution content 
	private void toggleControls(boolean enabled) {
		lockButton.setEnabled(enabled);
//		pollShackle.setEnabled(enabled);
	}

	/**
File
SocialBikeActivity.java
Developer's decision
Version 1
Kind of conflict
Comment
Chunk
Conflicting content 
			}
			locked = !locked;
			break;
<<<<<<< HEAD
		// case R.id.pollShackle:
		// sendCommand(COMMAND_SHACKLE_FEELER, (byte) COMMAND_SHACKLE_FEELER,
		// 1);
		// break;
=======
//		case R.id.pollShackle:
//			sendCommand(COMMAND_SHACKLE_FEELER, (byte) COMMAND_SHACKLE_FEELER,
//					1);
//			break;
>>>>>>> ed749b18651bae37d25631bf822f96f57334145b
		default:
			break;
		}
Solution content 
			}
			locked = !locked;
			break;
//		case R.id.pollShackle:
//			sendCommand(COMMAND_SHACKLE_FEELER, (byte) COMMAND_SHACKLE_FEELER,
//					1);
//			break;
		default:
			break;
		}
File
SocialBikeActivity.java
Developer's decision
Version 1
Kind of conflict
Comment