Projects >> bostonbusmap >>8c55c37e4f889004ac1f919b8d85e71a7d495510

Chunk
Conflicting content 
		routeToTransitSourceIdBuilder.put(orangeRoute, Schema.Routes.SourceId.Subway);
		routeToTransitSourceIdBuilder.put(blueRoute, Schema.Routes.SourceId.Subway);

<<<<<<< HEAD
		/*
		TODO: disabled because this functionality is provided by CommuterRailTransitSource
=======
>>>>>>> b41ffa7eabd699f8c24d163c897648c7d5705608
		for (String commuterRailRoute : commuterRailRoutes) {
			gtfsNameToRouteNameBuilder.put(commuterRailRoute, commuterRailRoute);
			routeToTransitSourceIdBuilder.put(commuterRailRoute, Schema.Routes.SourceId.CommuterRail);
Solution content 
		routeToTransitSourceIdBuilder.put(orangeRoute, Schema.Routes.SourceId.Subway);
		routeToTransitSourceIdBuilder.put(blueRoute, Schema.Routes.SourceId.Subway);

		for (String commuterRailRoute : commuterRailRoutes) {
			gtfsNameToRouteNameBuilder.put(commuterRailRoute, commuterRailRoute);
			routeToTransitSourceIdBuilder.put(commuterRailRoute, Schema.Routes.SourceId.CommuterRail);
File
MbtaRealtimeTransitSource.java
Developer's decision
Version 2
Kind of conflict
Comment