Projects >> quran_android >>18d8668cf48b54e0a56e3510f8bbe95af93028f5

Chunk
Conflicting content 
        public static final int menu_item_jump=0x7f07001e;
        public static final int menu_item_settings=0x7f070020;
        public static final int translation=0x7f020008;
    }
    public static final class id {
<<<<<<< HEAD
        public static final int bgPageview=0x7f070017;
        public static final int btnAboutBack=0x7f070005;
        public static final int btnEmailUs=0x7f070006;
        public static final int btnHelpBack=0x7f070009;
        public static final int cancelButton=0x7f07000b;
        public static final int chkArbaicNames=0x7f070019;
        public static final int chkFullScreen=0x7f07001b;
        public static final int chkKeepScreenOn=0x7f07001a;
        public static final int chkShowClock=0x7f07001c;
        public static final int gallery=0x7f07000d;
        public static final int jumpButton=0x7f07000c;
        public static final int linear=0x7f070000;
        public static final int menu_item_about_us=0x7f07001f;
        public static final int menu_item_bookmarks=0x7f070021;
        public static final int menu_item_help=0x7f070022;
        public static final int pageImageView=0x7f070011;
        public static final int pageScrollView=0x7f070012;
        public static final int page_field=0x7f07000a;
        public static final int page_info=0x7f070015;
        public static final int pagetitle=0x7f07000e;
        public static final int pageview=0x7f070018;
        public static final int splashview=0x7f07001d;
        public static final int suraSeek=0x7f07000f;
        public static final int sura_info=0x7f070014;
        public static final int sura_title=0x7f070013;
        public static final int suralist=0x7f070010;
        public static final int translationText=0x7f070016;
        public static final int txtAbout=0x7f070001;
        public static final int txtCopyRights=0x7f070004;
        public static final int txtDevelopedBy=0x7f070003;
        public static final int txtHelp=0x7f070008;
        public static final int txtHelpTitle=0x7f070007;
        public static final int txtSupport=0x7f070002;
=======
        public static final int bgPageview=0x7f070010;
        public static final int btnEmailUs=0x7f070002;
        public static final int btnHelpBack=0x7f070007;
        public static final int cancelButton=0x7f070009;
        public static final int jumpButton=0x7f07000a;
        public static final int lstBookmarks=0x7f070004;
        public static final int menu_item_about_us=0x7f070015;
        public static final int menu_item_bookmarks=0x7f070017;
        public static final int menu_item_bookmarks_add=0x7f070019;
        public static final int menu_item_bookmarks_remove=0x7f07001a;
        public static final int menu_item_bookmarks_view=0x7f070018;
        public static final int menu_item_help=0x7f07001c;
        public static final int menu_item_jump=0x7f070014;
        public static final int menu_item_settings=0x7f070016;
        public static final int menu_item_translations=0x7f07001b;
        public static final int pageScrollView=0x7f070012;
        public static final int page_field=0x7f070008;
        public static final int page_info=0x7f07000e;
        public static final int pageview=0x7f070011;
        public static final int splashview=0x7f070013;
        public static final int sura_info=0x7f07000d;
        public static final int sura_title=0x7f07000c;
        public static final int suralist=0x7f07000b;
        public static final int translationText=0x7f07000f;
        public static final int txtAbout=0x7f070003;
        public static final int txtCopyRights=0x7f070001;
        public static final int txtDevelopedBy=0x7f070000;
        public static final int txtHelp=0x7f070006;
        public static final int txtHelpTitle=0x7f070005;
>>>>>>> 2d5243aef6478afad22b24ecf3ce4650630c93c0
    }
    public static final class layout {
        public static final int about_us=0x7f030000;
Solution content 
        public static final int translation=0x7f020008;
    }
    public static final class id {
        public static final int bgPageview=0x7f070015;
        public static final int btnEmailUs=0x7f070002;
        public static final int btnHelpBack=0x7f070007;
        public static final int cancelButton=0x7f070009;
        public static final int gallery=0x7f07000b;
        public static final int jumpButton=0x7f07000a;
        public static final int lstBookmarks=0x7f070004;
        public static final int menu_item_about_us=0x7f070019;
        public static final int menu_item_bookmarks=0x7f07001b;
        public static final int menu_item_bookmarks_add=0x7f07001d;
        public static final int menu_item_bookmarks_remove=0x7f07001e;
        public static final int menu_item_bookmarks_view=0x7f07001c;
        public static final int menu_item_help=0x7f070020;
        public static final int menu_item_jump=0x7f070018;
        public static final int menu_item_settings=0x7f07001a;
        public static final int menu_item_translations=0x7f07001f;
        public static final int pageImageView=0x7f07000f;
        public static final int pageScrollView=0x7f070010;
        public static final int page_field=0x7f070008;
        public static final int page_info=0x7f070013;
        public static final int pagetitle=0x7f07000c;
        public static final int pageview=0x7f070016;
        public static final int splashview=0x7f070017;
        public static final int suraSeek=0x7f07000d;
        public static final int sura_info=0x7f070012;
        public static final int sura_title=0x7f070011;
        public static final int suralist=0x7f07000e;
        public static final int translationText=0x7f070014;
        public static final int txtAbout=0x7f070003;
        public static final int txtCopyRights=0x7f070001;
        public static final int txtDevelopedBy=0x7f070000;
        public static final int txtHelp=0x7f070006;
        public static final int txtHelpTitle=0x7f070005;
    }
    public static final class layout {
        public static final int about_us=0x7f030000;
File
R.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
        public static final int help=0x7f030002;
        public static final int jump_to=0x7f030003;
        public static final int quran_error=0x7f030004;
<<<<<<< HEAD
        public static final int quran_exp=0x7f030005;
        public static final int quran_list=0x7f030006;
        public static final int quran_page=0x7f030007;
        public static final int quran_row=0x7f030008;
        public static final int quran_translation=0x7f030009;
        public static final int quran_view=0x7f03000a;
        public static final int settings=0x7f03000b;
        public static final int splash_screen=0x7f03000c;
=======
        public static final int quran_list=0x7f030005;
        public static final int quran_row=0x7f030006;
        public static final int quran_translation=0x7f030007;
        public static final int quran_view=0x7f030008;
        public static final int splash_screen=0x7f030009;
>>>>>>> 2d5243aef6478afad22b24ecf3ce4650630c93c0
    }
    public static final class menu {
        public static final int option_menu=0x7f060000;
Solution content 
        public static final int help=0x7f030002;
        public static final int jump_to=0x7f030003;
        public static final int quran_error=0x7f030004;
        public static final int quran_exp=0x7f030005;
        public static final int quran_list=0x7f030006;
        public static final int quran_page=0x7f030007;
        public static final int quran_row=0x7f030008;
        public static final int quran_translation=0x7f030009;
        public static final int quran_view=0x7f03000a;
        public static final int splash_screen=0x7f03000b;
    }
    public static final class menu {
        public static final int option_menu=0x7f060000;
File
R.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.SharedPreferences;
<<<<<<< HEAD
=======
import android.content.DialogInterface.OnCancelListener;
import android.os.Bundle;
import android.preference.PreferenceManager;
>>>>>>> 2d5243aef6478afad22b24ecf3ce4650630c93c0
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
Solution content 
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
File
BaseQuranActivity.java
Developer's decision
Combination
Kind of conflict
Import
Chunk
Conflicting content 
import com.quran.labs.androidquran.QuranJumpDialog;
import com.quran.labs.androidquran.QuranPreferenceActivity;
import com.quran.labs.androidquran.R;
<<<<<<< HEAD
=======
import com.quran.labs.androidquran.TranslationActivity;
>>>>>>> 2d5243aef6478afad22b24ecf3ce4650630c93c0
import com.quran.labs.androidquran.data.ApplicationConstants;

public abstract class BaseQuranActivity extends Activity {
Solution content 
import com.quran.labs.androidquran.QuranJumpDialog;
import com.quran.labs.androidquran.QuranPreferenceActivity;
import com.quran.labs.androidquran.R;
import com.quran.labs.androidquran.TranslationActivity;
import com.quran.labs.androidquran.data.ApplicationConstants;

public abstract class BaseQuranActivity extends Activity {
File
BaseQuranActivity.java
Developer's decision
Version 2
Kind of conflict
Import