Projects >> dajkta-location-based-social-network >>1759e45e235d6c74b64e4839de140fadf0ffed50

Chunk
Conflicting content 
		chatHist = (ListView) findViewById(R.id.listChat);
		chatList = new ArrayList();
		
<<<<<<< HEAD
		chatList.add(edittext.getText().toString());
=======
>>>>>>> c55e754ef6d650b172be2f73e271d60f54a4411c
		
		
		new BroadcastReceiver() {
Solution content 
		chatHist = (ListView) findViewById(R.id.listChat);
		chatList = new ArrayList();
		
		
		
		new BroadcastReceiver() {
File
ChatActivity.java
Developer's decision
Version 2
Kind of conflict
Method invocation