Projects >> PPCalc >>29315293609586a962411d4ef674bb710e8acac9

Chunk
Conflicting content 
import cat.company.ppcalc.preferences.PreferencesActivity;
import cat.company.ppcalc.util.TitleProvider;

<<<<<<< HEAD:PPCalc/src/main/java/cat/company/ppcalc/PointsCalculatorActivity.java
public class PointsCalculatorActivity extends ActionBarActivity{
=======
public class MainActivity extends ActionBarActivity {
>>>>>>> 49e15b1d6c082c466dce9eee1e5dc12508dec319:PPCalc/src/main/java/cat/company/ppcalc/MainActivity.java
    private Unit.UnitEnum unit;

    final Context context;
Solution content 
import cat.company.ppcalc.preferences.PreferencesActivity;
import cat.company.ppcalc.util.TitleProvider;

public class MainActivity extends ActionBarActivity {
    private Unit.UnitEnum unit;

    final Context context;
File
PointsCalculatorActivity.java
Developer's decision
Version 2
Kind of conflict
Other
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD:PPCalc/src/main/java/cat/company/ppcalc/PointsCalculatorActivity.java
    public PointsCalculatorActivity(){
        context=this;
=======
    private int previousSelectedDrawer = 0;
    private Boolean purchased;
    private AdView adView;
    private Vector drawerMenu;
    private ActionBar actionBar;
    private List fragments;
    private PagerAdapter mPagerAdapter;

    public MainActivity() {
        context = this;
>>>>>>> 49e15b1d6c082c466dce9eee1e5dc12508dec319:PPCalc/src/main/java/cat/company/ppcalc/MainActivity.java
    }

    /**
Solution content 
        }
    }

    private int previousSelectedDrawer = 0;
    private Boolean purchased;
    private AdView adView;
    private Vector drawerMenu;
    private ActionBar actionBar;
    private List fragments;
    private PagerAdapter mPagerAdapter;
    public MainActivity() {
        context = this;
    }

    /**
File
PointsCalculatorActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method signature
Chunk
Conflicting content 
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
<<<<<<< HEAD:PPCalc/src/main/java/cat/company/ppcalc/PointsCalculatorActivity.java
        setContentView(R.layout.activity_calculator);
        final ActionBar actionBar = getSupportActionBar();
=======
        setContentView(R.layout.main);
        bound = false;
        purchased = false;
        getApplicationContext().bindService(new Intent("com.android.vending.billing.InAppBillingService.BIND"),
                mServiceConn, Context.BIND_AUTO_CREATE);

        actionBar = getSupportActionBar();

>>>>>>> 49e15b1d6c082c466dce9eee1e5dc12508dec319:PPCalc/src/main/java/cat/company/ppcalc/MainActivity.java
        mDrawerList = (ListView) findViewById(R.id.left_drawer);
        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
Solution content 
    @Override
    public void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.main);
        bound = false;
        purchased = false;
        getApplicationContext().bindService(new Intent("com.android.vending.billing.InAppBillingService.BIND"),
                mServiceConn, Context.BIND_AUTO_CREATE);

        actionBar = getSupportActionBar();

        mDrawerList = (ListView) findViewById(R.id.left_drawer);
        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
File
PointsCalculatorActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable