Projects >> android-arabic-reader >>28e4ea935722640758c3b29e59d8f1d2f41f31df

Chunk
Conflicting content 
	private DirectoriesAdapter myAdapter;
	private ArrayList myFolderList;
	private String myChooserTitle;
<<<<<<< HEAD
	private ZLResource myResource;
	private boolean myChooseWritableDirectoriesOnly;
=======
	private boolean myChooseWritableDirectoriesOnly;
	private ZLResource myResource;
>>>>>>> 2cc7335d11cc0dab3463b4c2d386e9a4bb0e8d83

	@Override
	protected void onCreate(Bundle savedInstanceState) {
Solution content 
	private DirectoriesAdapter myAdapter;
	private ArrayList myFolderList;
	private String myChooserTitle;
	private boolean myChooseWritableDirectoriesOnly;
	private ZLResource myResource;

	@Override
	protected void onCreate(Bundle savedInstanceState) {
File
FolderListDialogActivity.java
Developer's decision
Version 2
Kind of conflict
Attribute
Chunk
Conflicting content 
		setTitle(intent.getStringExtra(Key.ACTIVITY_TITLE));
		myChooserTitle = intent.getStringExtra(Key.CHOOSER_TITLE);
		myChooseWritableDirectoriesOnly = intent.getBooleanExtra(Key.WRITABLE_FOLDERS_ONLY, true);
<<<<<<< HEAD

=======
>>>>>>> 2cc7335d11cc0dab3463b4c2d386e9a4bb0e8d83
		myResource = ZLResource.resource("dialog").getResource("folderList");

		setupActionButtons();
Solution content 
		setTitle(intent.getStringExtra(Key.ACTIVITY_TITLE));
		myChooserTitle = intent.getStringExtra(Key.CHOOSER_TITLE);
		myChooseWritableDirectoriesOnly = intent.getBooleanExtra(Key.WRITABLE_FOLDERS_ONLY, true);
		myResource = ZLResource.resource("dialog").getResource("folderList");

		setupActionButtons();
File
FolderListDialogActivity.java
Developer's decision
Version 1
Kind of conflict
Blank