Projects >> bostonbusmap >>e7e520dfaee6a38cfa2f2f048fa79ca09a85b17b

Chunk
Conflicting content
			defaultTransitSource = new TorontoBusTransitSource(this, busDrawables, busTransitRoutes, routeTitles);
			
			ImmutableMap.Builder mapBuilder = ImmutableMap.builder();
<<<<<<< HEAD
=======
			MbtaRealtimeTransitSource subwayTransitSource = new MbtaRealtimeTransitSource(
					subwayDrawables,
					routeTitles.getMappingForSources(new int[] {Schema.Routes.enumagencyidSubway}), this);
			for (String route : subwayTransitSource.getRouteTitles().routeTags()) {
				mapBuilder.put(route, subwayTransitSource);
			}

            CommuterRailTransitSource commuterRailTransitSource = new CommuterRailTransitSource(commuterRailDrawables,
                    routeTitles.getMappingForSource(Schema.Routes.enumagencyidCommuterRail), this);
            for (String route : commuterRailTransitSource.getRouteTitles().routeTags()) {
                mapBuilder.put(route, commuterRailTransitSource);
            }
			
			HubwayTransitSource hubwayTransitSource = new HubwayTransitSource(hubwayDrawables, hubwayTransitRoutes,
					this);
>>>>>>> 8a76b1c8f5bf13036c3519e26ecd681dea706526

			transitSourceMap = mapBuilder.build();
Solution content
			defaultTransitSource = new TorontoBusTransitSource(this, busDrawables, busTransitRoutes, routeTitles);
			
			ImmutableMap.Builder mapBuilder = ImmutableMap.builder();

            /*
			MbtaRealtimeTransitSource subwayTransitSource = new MbtaRealtimeTransitSource(
					subwayDrawables,
					routeTitles.getMappingForSources(new int[] {Schema.Routes.enumagencyidSubway}), this);
			for (String route : subwayTransitSource.getRouteTitles().routeTags()) {
				mapBuilder.put(route, subwayTransitSource);
			}

            CommuterRailTransitSource commuterRailTransitSource = new CommuterRailTransitSource(commuterRailDrawables,
                    routeTitles.getMappingForSource(Schema.Routes.enumagencyidCommuterRail), this);
            for (String route : commuterRailTransitSource.getRouteTitles().routeTags()) {
                mapBuilder.put(route, commuterRailTransitSource);
            }
			
			HubwayTransitSource hubwayTransitSource = new HubwayTransitSource(hubwayDrawables, hubwayTransitRoutes,
					this);
            */

			transitSourceMap = mapBuilder.build();
File
TransitSystem.java
Developer's decision
Manual
Kind of conflict
For statement
Method invocation
Variable