Projects >> drawgeo >>5dac4da2c09c5067bff7aff3fc74f8932e8079c5

Chunk
Conflicting content 
		return true;
	}

<<<<<<< HEAD
	public class getNewWordsTask extends AsyncTask {
=======
	private class getNewWordsTask extends AsyncTask {
>>>>>>> 82bd17636b18fcff16573bb6635ffac27876c8ca

		@Override
		protected Word[] doInBackground(Void... nothing) {
Solution content 
		return true;
	}


	private class getNewWordsTask extends AsyncTask {

		@Override
		protected Word[] doInBackground(Void... nothing) {
File
MapsActivity.java
Developer's decision
Version 2
Kind of conflict
Class signature
Chunk
Conflicting content 
	public static Bitmap avatarImage;
	public static String drawidreplay;
	public static int num_created;
<<<<<<< HEAD
	public static String current_word;
	public static String current_password;
	public static String current_description;
=======

	public static int wordID = -1;
	public static Word current_word;
>>>>>>> 82bd17636b18fcff16573bb6635ffac27876c8ca
	public static double latitudenow = -1.0;
	public static double longitudenow = -1.0;
Solution content 
	public static Bitmap avatarImage;
	public static String drawidreplay;
	public static int num_created;

	public static String current_password;
	public static String current_description;
	public static int wordID = -1;
	public static Word current_word;
	public static double latitudenow = -1.0;
	public static double longitudenow = -1.0;
File
Configurations.java
Developer's decision
Combination
Kind of conflict
Attribute