Projects >> bostonbusmap >>cc340498de561133d79c785d65fc1b2cf1583669

Chunk
Conflicting content 
			defaultTransitSource = new LABusTransitSource(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);
>>>>>>> e565692a9fd7871a0836dd8e1c18bbeaa8bba9b0

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

			transitSourceMap = mapBuilder.build();
File
TransitSystem.java
Developer's decision
Version 1
Kind of conflict
For statement
Method invocation
Variable
Chunk
Conflicting content 
=======

			transitSourceMap = mapBuilder.build();

<<<<<<< HEAD
			transitSources = ImmutableList.of(defaultTransitSource);

			transitSources = ImmutableList.of(subwayTransitSource, commuterRailTransitSource, hubwayTransitSource,
					defaultTransitSource);
		
>>>>>>> e565692a9fd7871a0836dd8e1c18bbeaa8bba9b0
		}
		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