| Chunk |
|---|
| Conflicting content |
|---|
phoneMgr = new PhoneInterfaceManager(this, phone);
<<<<<<< HEAD
=======
mCM = CallManager.getInstance();
mCM.registerPhone(phone);
>>>>>>> 33d49f148e06b84efacc4e0644ecf2064aad4d39
int phoneType = phone.getPhoneType();
|
| Solution content |
|---|
phoneMgr = new PhoneInterfaceManager(this, phone);
int phoneType = phone.getPhoneType();
|
| File |
|---|
| PhoneApp.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Method invocation |