| Chunk |
|---|
| Conflicting content |
|---|
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
<<<<<<< HEAD
import org.geometerplus.android.util.UIUtil;
=======
import org.geometerplus.zlibrary.ui.android.R;
>>>>>>> 7cfbd7c270326338752a8af9059f9bc1ae1723a5
public class RefreshRootCatalogAction extends RootAction {
public RefreshRootCatalogAction(Activity activity) { |
| Solution content |
|---|
import org.geometerplus.fbreader.network.NetworkTree;
import org.geometerplus.fbreader.network.NetworkLibrary;
public class RefreshRootCatalogAction extends RootAction {
public RefreshRootCatalogAction(Activity activity) { |
| File |
|---|
| RefreshRootCatalogAction.java |
| Developer's decision |
|---|
| None |
| Kind of conflict |
|---|
| Import |