| Chunk |
|---|
| Conflicting content |
|---|
private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
private static final String emailSubject = "Toronto Transit error report";
<<<<<<< HEAD
private static final boolean showRunNumber = true;
=======
private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
private static final String emailSubject = "BostonBusMap error report";
private static final String feedbackUrl = "http://www.mbta.com/customer_support/feedback/";
>>>>>>> 3e3673044bd6ce3bef4a9e06d1350b78fc6bfb03
/**
* Unimplemented for Toronto |
| Solution content |
|---|
private static final String[] emails = new String[]{"bostonbusmap@gmail.com"};
private static final String emailSubject = "Toronto Transit error report";
private static final boolean showRunNumber = true;
private static final String feedbackUrl = "https://www.ttc.ca/Customer_Service/Compliments_Complaints_Suggestions/index.jsp";
/**
* Unimplemented for Toronto |
| File |
|---|
| TransitSystem.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
* This will be null when alerts haven't been read yet
*/
private AlertsFuture alertsFuture;
<<<<<<< HEAD
public static double getCenterLat() {
return torontoLatitude;
=======
private static final String agencyName = "MBTA";
public static double getCenterLat() {
return bostonLatitude;
>>>>>>> 3e3673044bd6ce3bef4a9e06d1350b78fc6bfb03
}
public static double getCenterLon() { |
| Solution content |
|---|
* This will be null when alerts haven't been read yet
*/
private AlertsFuture alertsFuture;
private static final String agencyName = "Toronto Transit Commission";
public static double getCenterLat() {
return torontoLatitude;
}
public static double getCenterLon() { |
| File |
|---|
| TransitSystem.java |
| Developer's decision |
|---|
| Manual |
| Kind of conflict |
|---|
| Attribute |
| Method signature |
| Return statement |
| Chunk |
|---|
| Conflicting content |
|---|
transitSourceMap = mapBuilder.build();
<<<<<<< HEAD
transitSources = ImmutableList.of(defaultTransitSource);
=======
transitSources = ImmutableList.of(subwayTransitSource, hubwayTransitSource,
defaultTransitSource);
>>>>>>> 3e3673044bd6ce3bef4a9e06d1350b78fc6bfb03
}
else
{ |
| Solution content |
|---|
transitSourceMap = mapBuilder.build();
transitSources = ImmutableList.of(defaultTransitSource);
}
else
{ |
| File |
|---|
| TransitSystem.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |
| Chunk |
|---|
| Conflicting content |
|---|
public final static int FIRST_COPYING_DB = 37;
public final static int ADDING_BOUNDS = 38;
<<<<<<< HEAD
public final static int ADDING_BOUNDS_2 = 39;
public final static int ADDING_BOUNDS_3 = 40;
public final static int FIX_LOCATIONS = 41;
public final static int FIX_LOCATIONS_2 = 42;
public final static int FIX_LOCATIONS_3 = 43;
public final static int FIX_LOCATIONS_4 = 44;
public final static int FIX_LOCATIONS_5 = 45;
public final static int FIX_LOCATIONS_6 = 46;
public final static int FIX_LOCATIONS_7 = 47;
public final static int FIX_LOCATIONS_8 = 48;
public final static int FIX_LOCATIONS_9 = 49;
public final static int FIX_LOCATIONS_10 = 50;
public final static int FIX_LOCATIONS_11 = 51;
public final static int FIX_LOCATIONS_12 = 52;
public final static int CURRENT_DB_VERSION = FIX_LOCATIONS_12;
=======
public final static int ADDING_BOUNDS_1 = 39;
public final static int ADDING_BOUNDS_2 = 42;
public final static int FIX_LOCATIONS = 43;
public final static int NEW_SUBWAY = 44;
public final static int NEW_CR = 45;
public final static int NEW_CR_2 = 46;
public final static int HUBWAY_1 = 50;
public final static int HUBWAY_2 = 51;
public final static int HUBWAY_3 = 52;
public final static int HUBWAY_4 = 53;
public final static int HUBWAY_5 = 54;
public final static int HUBWAY_6 = 55;
public final static int HUBWAY_7 = 56;
public final static int HUBWAY_8 = 57;
public final static int HUBWAY_9 = 58;
public final static int HUBWAY_10 = 59;
public final static int HUBWAY_11 = 60;
public final static int HUBWAY_12 = 61;
public final static int HUBWAY_13 = 62;
public final static int HUBWAY_14 = 63;
public final static int HUBWAY_15 = 64;
public final static int HUBWAY_16 = 65;
public final static int HUBWAY_17 = 66;
public final static int HUBWAY_18 = 67;
public final static int HUBWAY_19 = 68;
public final static int HUBWAY_20 = 69;
public final static int HUBWAY_21 = 70;
public final static int NEW_3 = 73;
public final static int CURRENT_DB_VERSION = NEW_3;
>>>>>>> 3e3673044bd6ce3bef4a9e06d1350b78fc6bfb03
public static final int ALWAYS_POPULATE = 3;
public static final int POPULATE_IF_UPGRADE = 2; |
| Solution content |
|---|
public final static int FIRST_COPYING_DB = 37;
public final static int ADDING_BOUNDS = 38;
public final static int ADDING_BOUNDS_1 = 39;
public final static int ADDING_BOUNDS_2 = 42;
public final static int FIX_LOCATIONS = 43;
public final static int NEW_SUBWAY = 44;
public final static int NEW_CR = 45;
public final static int NEW_CR_2 = 46;
public final static int HUBWAY_1 = 50;
public final static int HUBWAY_2 = 51;
public final static int HUBWAY_3 = 52;
public final static int HUBWAY_4 = 53;
public final static int HUBWAY_5 = 54;
public final static int HUBWAY_6 = 55;
public final static int HUBWAY_7 = 56;
public final static int HUBWAY_8 = 57;
public final static int HUBWAY_9 = 58;
public final static int HUBWAY_10 = 59;
public final static int HUBWAY_11 = 60;
public final static int HUBWAY_12 = 61;
public final static int HUBWAY_13 = 62;
public final static int HUBWAY_14 = 63;
public final static int HUBWAY_15 = 64;
public final static int HUBWAY_16 = 65;
public final static int HUBWAY_17 = 66;
public final static int HUBWAY_18 = 67;
public final static int HUBWAY_19 = 68;
public final static int HUBWAY_20 = 69;
public final static int HUBWAY_21 = 70;
public final static int NEW_3 = 73;
public final static int CURRENT_DB_VERSION = NEW_3;
public static final int ALWAYS_POPULATE = 3;
public static final int POPULATE_IF_UPGRADE = 2; |
| File |
|---|
| DatabaseContentProvider.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |