Projects >> BF3-Battlelog >>c9e27f3f3cf5e2134eec74342fefe767ab939fe8

Chunk
Conflicting content 
    }

    @Override
<<<<<<< HEAD
    public void loadFinished(Loader loader, CompletedTask task) {
        if (task.result.equals(CompletedTask.Result.SUCCESS)) {
=======
    public void loadFinished(Loader loader, CompletedTask task) {    	
    	/* FIXME: This doesn't seem right, maybe due to the lack of personas? */
        if ( task != null && task.result.equals(CompletedTask.Result.SUCCESS)) {
            Log.e("STATS", "Load finished");
>>>>>>> a2549696fdc75071ac65076c40d1d3a3c201dc29
            findViews();
            PersonaInfo pi = personaStatsFrom(task);
            updateDatabase(pi);
Solution content 
    }

    @Override
    public void loadFinished(Loader loader, CompletedTask task) {
    	/* FIXME: This doesn't seem right, maybe due to the lack of personas? */
        if ( task != null && task.result.equals(CompletedTask.Result.SUCCESS)) {
            Log.e("STATS", "Load finished");
            findViews();
            PersonaInfo pi = personaStatsFrom(task);
            updateDatabase(pi);
File
ProfileStatsFragment.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Method invocation
Method signature