Projects >> HQTP >>f93336a191da8a7aa87ebbbdb81fc52e88388e5b

Chunk
Conflicting content 
public class HQTPActivity extends RoboActivity implements OnClickListener {

<<<<<<< HEAD
    @InjectView(R.id.getallpost_button)     Button getallpost_button;
    @InjectView(R.id.post_button)           Button post_button;
    @Inject HQTPProxy proxy;
=======
    @InjectView(R.id.authentication_button)
    Button authentication_button;
    @InjectView(R.id.getallpost_button)
    Button getallpost_button;
    @InjectView(R.id.post_button)
    Button post_button;
    @Inject
    HQTPProxy proxy;
>>>>>>> 06bf203ef6d5595bd5d252df60c340efce2f6da9

    @Override
    public void onCreate(Bundle savedInstanceState) {
Solution content 
public class HQTPActivity extends RoboActivity implements OnClickListener {

    @InjectView(R.id.getallpost_button)
    Button getallpost_button;
    @InjectView(R.id.post_button)
    Button post_button;
    @Inject
    HQTPProxy proxy;

    @Override
    public void onCreate(Bundle savedInstanceState) {
File
HQTPActivity.java
Developer's decision
Version 1
Kind of conflict
Annotation
Attribute