Projects >> bostonbusmap >>9469e674281ecff2e8604d123f35535783544df5

Chunk
Conflicting content 
	public final static int TORONTO_DB_1 = 22;
	public final static int TORONTO_DB_2 = 23;

<<<<<<< HEAD
	public final static int VERBOSE_DBV2_1 = 25;
	public final static int VERBOSE_DBV2_2 = 26;
	public final static int VERBOSE_DBV2_3 = 27;
	
	public final static int CURRENT_DB_VERSION = VERBOSE_DBV2_3;
=======
	public final static int VERBOSE_DBV2_1 = 24;
	public final static int VERBOSE_DBV2_2 = 26;
	
	public final static int CURRENT_DB_VERSION = VERBOSE_DBV2_2;
>>>>>>> f486c15ae3165589632d78b644e0cdcca1af8ab8
	
	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
Solution content 
	public final static int TORONTO_DB_1 = 22;
	public final static int TORONTO_DB_2 = 23;

	public final static int VERBOSE_DBV2_1 = 25;
	public final static int VERBOSE_DBV2_2 = 26;
	public final static int VERBOSE_DBV2_3 = 27;
	
	public final static int CURRENT_DB_VERSION = VERBOSE_DBV2_3;
	
	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
File
DatabaseHelper.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
		{
			favorites = new HashSet();
			populateFavorites(favorites, false, db);
<<<<<<< HEAD
		}

=======
		}*/
		
>>>>>>> f486c15ae3165589632d78b644e0cdcca1af8ab8
		if (oldVersion < VERBOSE_DBV2_2)
		{
			db.execSQL("DROP TABLE IF EXISTS " + directionsTable);
Solution content 
		{
			favorites = new HashSet();
			populateFavorites(favorites, false, db);
		}*/
		
		if (oldVersion < VERBOSE_DBV2_2)
		{
			db.execSQL("DROP TABLE IF EXISTS " + directionsTable);
File
DatabaseHelper.java
Developer's decision
Version 2
Kind of conflict
Other