| Chunk |
|---|
| Conflicting content |
|---|
Fragment fragment = (Fragment)object;
if (DEBUG) Log.v(TAG, "Detaching item #" + position + ": f=" + fragment
+ " v=" + fragment.getView());
<<<<<<< HEAD
=======
fragment.mViewPagerParticipant = false;
>>>>>>> f409f824f12a37d8c979d492e5022ca837010e89
mCurTransaction.detach(fragment);
}
|
| Solution content |
|---|
Fragment fragment = (Fragment)object;
if (DEBUG) Log.v(TAG, "Detaching item #" + position + ": f=" + fragment
+ " v=" + fragment.getView());
mCurTransaction.detach(fragment);
}
|
| File |
|---|
| FragmentPagerAdapter.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Variable |