Projects >> bostonbusmap >>3e0c3df6096bc906cc33dcc3675ca9987c7e16fb

Chunk
Conflicting content 
	public final static int VERBOSE_DBV2_3 = 27;
	public final static int VERBOSE_DBV2_4 = 28;
	
<<<<<<< HEAD
	public final static int CURRENT_DB_VERSION = VERBOSE_DBV2_4;
=======
	public final static int WITH_STOPS_FOR_DIR = 35;
	
	public final static int CURRENT_DB_VERSION = WITH_STOPS_FOR_DIR;
>>>>>>> d2346bae956a808b67d5dbc29bea22b1194188ac
	
	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
Solution content 
	public final static int VERBOSE_DBV2_3 = 27;
	public final static int VERBOSE_DBV2_4 = 28;
	
	public final static int WITH_STOPS_FOR_DIR = 35;
	
	public final static int CURRENT_DB_VERSION = WITH_STOPS_FOR_DIR;
	
	public static final int ALWAYS_POPULATE = 3;
	public static final int POPULATE_IF_UPGRADE = 2;
File
DatabaseHelper.java
Developer's decision
Version 2
Kind of conflict
Attribute