Projects >> Book-Catalogue >>1c16485fc8949bba32715283466242e4fb0d0aa9

Chunk
Conflicting content 
import android.view.View.OnClickListener;
import android.widget.Toast;

<<<<<<< HEAD
import com.eleybourn.bookcatalogue.StandardDialogs.SimpleDialogFileItem;
import com.eleybourn.bookcatalogue.StandardDialogs.SimpleDialogItem;
import com.eleybourn.bookcatalogue.StandardDialogs.SimpleDialogOnClickListener;
=======
import com.eleybourn.bookcatalogue.ManagedTask.TaskHandler;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogFileItem;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogItem;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogOnClickListener;
>>>>>>> c63754227851107d4f8c60591071f648bbab0f0e
import com.eleybourn.bookcatalogue.goodreads.GoodreadsManager;
import com.eleybourn.bookcatalogue.goodreads.GoodreadsRegister;
import com.eleybourn.bookcatalogue.goodreads.ImportAllTask;
Solution content 
import android.view.View.OnClickListener;
import android.widget.Toast;

import com.eleybourn.bookcatalogue.dialogs.StandardDialogs;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogFileItem;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogItem;
import com.eleybourn.bookcatalogue.dialogs.StandardDialogs.SimpleDialogOnClickListener;
import com.eleybourn.bookcatalogue.goodreads.GoodreadsManager;
import com.eleybourn.bookcatalogue.goodreads.GoodreadsRegister;
import com.eleybourn.bookcatalogue.goodreads.ImportAllTask;
File
AdministrationFunctions.java
Developer's decision
Combination
Kind of conflict
Import