Projects >> bostonbusmap >>fe62c286c3a07b2ff3f3a9cdbd7581ed48a750cd

Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.List;

<<<<<<< HEAD
import com.schneeloch.latransit.R;
=======
import boston.Bus.Map.R;
import boston.Bus.Map.data.Selection;
>>>>>>> 405a607d8e52a63a1e9fb49977eb6dd2093960a0

import android.app.Activity;
import android.content.Context;
Solution content 
import java.util.ArrayList;
import java.util.List;

import com.schneeloch.latransit.R;
import boston.Bus.Map.data.Selection;

import android.app.Activity;
import android.content.Context;
File
ModeAdapter.java
Developer's decision
Combination
Kind of conflict
Import