Projects >> BF3-Battlelog >>eac9531d511c2715bf1ee59f81ae64051034e84f

Chunk
Conflicting content 
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
<<<<<<< HEAD
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TableLayout;
import android.widget.TableRow;
import android.widget.TextView;
=======
import android.widget.*;
>>>>>>> c41e384ba0e27b164afea640484ab625fa1b7204

import com.google.gson.Gson;
import com.ninetwozero.battlelog.R;
Solution content 
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ProgressBar;
import android.widget.RelativeLayout;
import android.widget.TableLayout;
import android.widget.TextView;

import com.google.gson.Gson;
import com.ninetwozero.battlelog.R;
File
ProfileStatsFragment.java
Developer's decision
Combination
Kind of conflict
Import