| Chunk |
|---|
| Conflicting content |
|---|
import org.geometerplus.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; <<<<<<< HEAD import org.geometerplus.zlibrary.ui.android.library.ZLAndroidActivity; ======= import org.geometerplus.zlibrary.ui.android.error.ErrorKeys; >>>>>>> 60defe9d2ceb7d877fec873ca86de8955910b8fa import org.geometerplus.android.util.UIUtil; |
| Solution content |
|---|
import org.geometerplus.zlibrary.core.view.ZLViewWidget; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidLibrary; import org.geometerplus.zlibrary.ui.android.library.ZLAndroidActivity; import org.geometerplus.zlibrary.ui.android.error.ErrorKeys; import org.geometerplus.android.util.UIUtil; |
| File |
|---|
| ZLAndroidApplicationWindow.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Import |