Projects >> frostwire-android >>3278e80e97bc06e5cedd49209f0186f55830f533

Chunk
Conflicting content 
import android.app.Fragment;
import android.content.Intent;
import android.net.Uri;
<<<<<<< HEAD

import com.andrew.apollo.ui.activities.AudioPlayerActivity;
=======
>>>>>>> 127199efe833b6b03af278e5c1d4e433ac51e661
import com.appia.sdk.Appia;
import com.appia.sdk.Appia.WallDisplayType;
import com.frostwire.android.R;
Solution content 
import android.app.Fragment;
import android.content.Intent;
import android.net.Uri;
import com.andrew.apollo.ui.activities.AudioPlayerActivity;
import com.appia.sdk.Appia;
import com.appia.sdk.Appia.WallDisplayType;
import com.frostwire.android.R;
File
MainController.java
Developer's decision
Version 1
Kind of conflict
Import