Projects >> Pocket-Books-Pro >>b866a7e765bcb2c55b8d1646ea6675f9661d5874

Chunk
Conflicting content
        public static final int square_shadowed=0x7f020006;
    }
    public static final class id {
<<<<<<< HEAD
        public static final int Deposit_Or_Withdrawl=0x7f0b001c;
        public static final int Deposit_Or_Withdrawl_Or_Transfer=0x7f0b0038;
        public static final int Done=0x7f0b0042;
        public static final int Payee_editText=0x7f0b001b;
        public static final int Payee_textView=0x7f0b001a;
        public static final int TextView01=0x7f0b002c;
        public static final int accountBalance=0x7f0b000b;
        public static final int accountNameListView=0x7f0b0008;
        public static final int account_From_Spinner=0x7f0b002d;
        public static final int account_To_Spinner=0x7f0b002f;
        public static final int account_To_TextView=0x7f0b002e;
        public static final int account_balance=0x7f0b000a;
        public static final int account_delete=0x7f0b003f;
        public static final int account_edit=0x7f0b003e;
        public static final int account_name=0x7f0b0009;
        public static final int actionSpinner=0x7f0b002b;
        public static final int addAccountText=0x7f0b0007;
        public static final int addCategoryText=0x7f0b000f;
        public static final int addTransactionIcon=0x7f0b0006;
        public static final int addTransactionText=0x7f0b0035;
        public static final int add_transaction=0x7f0b0049;
        public static final int amount_EditText=0x7f0b0021;
        public static final int amount_TextView=0x7f0b0020;
        public static final int backup=0x7f0b0047;
        public static final int buttonDone=0x7f0b0016;
        public static final int categories=0x7f0b0045;
        public static final int category_Frame=0x7f0b0030;
        public static final int category_Spinner=0x7f0b0027;
        public static final int category_TextView=0x7f0b0026;
        public static final int category_name=0x7f0b0012;
        public static final int date_EditText=0x7f0b0024;
        public static final int date_TextView=0x7f0b0023;
        public static final int delete=0x7f0b0040;
        public static final int desposit_RadioButton=0x7f0b001e;
        public static final int edit=0x7f0b0041;
        public static final int editTextCategoryName=0x7f0b0018;
        public static final int footer=0x7f0b0005;
        public static final int funds=0x7f0b0004;
        public static final int fundsTextView=0x7f0b0032;
        public static final int help=0x7f0b0048;
        public static final int imageView1=0x7f0b0001;
        public static final int linearLayout1=0x7f0b0002;
        public static final int listView1=0x7f0b0034;
        public static final int listViewCategories=0x7f0b0010;
        public static final int new_account=0x7f0b0000;
        public static final int new_account_balance_edit_text=0x7f0b0014;
        public static final int new_account_done_button=0x7f0b0015;
        public static final int new_account_name_edit_text=0x7f0b0013;
        public static final int new_transaction=0x7f0b0043;
        public static final int new_transaction_activity_done_Button=0x7f0b0019;
        public static final int note_EditText=0x7f0b002a;
        public static final int note_TextView=0x7f0b0029;
        public static final int overview=0x7f0b0031;
        public static final int overviewRecentTransactionsHeader=0x7f0b0033;
        public static final int overviewTotalHeader=0x7f0b0037;
        public static final int pendingLabel=0x7f0b0003;
        public static final int preferences=0x7f0b0046;
        public static final int radioButtonExpense=0x7f0b000d;
        public static final int radioButtonIncome=0x7f0b000e;
        public static final int radioGroupExpenseOrIncome=0x7f0b000c;
        public static final int spinnerCategory=0x7f0b0011;
        public static final int tableRow1=0x7f0b001f;
        public static final int tableRow2=0x7f0b0022;
        public static final int tableRow3=0x7f0b0025;
        public static final int tableRow4=0x7f0b0028;
        public static final int textViewCategoryName=0x7f0b0017;
        public static final int transactionListView=0x7f0b0036;
        public static final int transaction_amount=0x7f0b003a;
        public static final int transaction_category=0x7f0b003b;
        public static final int transaction_date=0x7f0b003c;
        public static final int transaction_memo=0x7f0b003d;
        public static final int transaction_name=0x7f0b0039;
        public static final int transfer=0x7f0b0044;
        public static final int withdrawl_RadioButton=0x7f0b001d;
=======
        public static final int Deposit_Or_Withdrawl=0x7f0b0017;
        public static final int Deposit_Or_Withdrawl_Or_Transfer=0x7f0b002d;
        public static final int Done=0x7f0b0040;
        public static final int Payee_editText=0x7f0b0016;
        public static final int Payee_textView=0x7f0b0015;
        public static final int TextView01=0x7f0b0027;
        public static final int accountBalance=0x7f0b0006;
        public static final int accountNameListView=0x7f0b0003;
        public static final int account_From_Spinner=0x7f0b0028;
        public static final int account_To_Spinner=0x7f0b002a;
        public static final int account_To_TextView=0x7f0b0029;
        public static final int account_balance=0x7f0b0005;
        public static final int account_delete=0x7f0b003d;
        public static final int account_edit=0x7f0b003c;
        public static final int account_name=0x7f0b0004;
        public static final int actionSpinner=0x7f0b0026;
        public static final int addAccountText=0x7f0b0002;
        public static final int addCategoryText=0x7f0b000a;
        public static final int addTransactionIcon=0x7f0b0001;
        public static final int addTransactionText=0x7f0b0033;
        public static final int add_transaction=0x7f0b0045;
        public static final int amount_EditText=0x7f0b001c;
        public static final int amount_TextView=0x7f0b001b;
        public static final int balance_textView=0x7f0b002e;
        public static final int buttonDone=0x7f0b0011;
        public static final int categories=0x7f0b0043;
        public static final int category_Frame=0x7f0b002b;
        public static final int category_Spinner=0x7f0b0022;
        public static final int category_TextView=0x7f0b0021;
        public static final int category_name=0x7f0b000d;
        public static final int date_EditText=0x7f0b001f;
        public static final int date_TextView=0x7f0b001e;
        public static final int delete=0x7f0b003e;
        public static final int desposit_RadioButton=0x7f0b0019;
        public static final int edit=0x7f0b003f;
        public static final int editTextCategoryName=0x7f0b0013;
        public static final int footer=0x7f0b0000;
        public static final int fundsTextView=0x7f0b002f;
        public static final int linearLayout1=0x7f0b0031;
        public static final int listView1=0x7f0b0030;
        public static final int listViewCategories=0x7f0b000b;
        public static final int new_account_balance_edit_text=0x7f0b000f;
        public static final int new_account_done_button=0x7f0b0010;
        public static final int new_account_name_edit_text=0x7f0b000e;
        public static final int new_transaction=0x7f0b0041;
        public static final int new_transaction_activity_done_Button=0x7f0b0014;
        public static final int note_EditText=0x7f0b0025;
        public static final int note_TextView=0x7f0b0024;
        public static final int overview=0x7f0b002c;
        public static final int overviewRecentTransactionsHeader=0x7f0b0036;
        public static final int overviewTotalHeader=0x7f0b0035;
        public static final int pendingLabel=0x7f0b0032;
        public static final int preferences=0x7f0b0044;
        public static final int radioButtonExpense=0x7f0b0008;
        public static final int radioButtonIncome=0x7f0b0009;
        public static final int radioGroupExpenseOrIncome=0x7f0b0007;
        public static final int spinnerCategory=0x7f0b000c;
        public static final int tableRow1=0x7f0b001a;
        public static final int tableRow2=0x7f0b001d;
        public static final int tableRow3=0x7f0b0020;
        public static final int tableRow4=0x7f0b0023;
        public static final int textViewCategoryName=0x7f0b0012;
        public static final int transactionListView=0x7f0b0034;
        public static final int transaction_amount=0x7f0b0038;
        public static final int transaction_category=0x7f0b0039;
        public static final int transaction_date=0x7f0b003a;
        public static final int transaction_memo=0x7f0b003b;
        public static final int transaction_name=0x7f0b0037;
        public static final int transfer=0x7f0b0042;
        public static final int withdrawl_RadioButton=0x7f0b0018;
>>>>>>> 94bac33727c93499e64c282fe8e011092ab843dd
    }
    public static final class layout {
        public static final int accounts_activity_layout=0x7f030000;
Solution content
        public static final int actionSpinner=0x7f0b002b;
        public static final int square_shadowed=0x7f020006;
    }
    public static final class id {
        public static final int Deposit_Or_Withdrawl=0x7f0b001c;
        public static final int Deposit_Or_Withdrawl_Or_Transfer=0x7f0b0038;
        public static final int Done=0x7f0b0042;
        public static final int Payee_editText=0x7f0b001b;
        public static final int Payee_textView=0x7f0b001a;
        public static final int TextView01=0x7f0b002c;
        public static final int accountBalance=0x7f0b000b;
        public static final int accountNameListView=0x7f0b0008;
        public static final int account_From_Spinner=0x7f0b002d;
        public static final int account_To_Spinner=0x7f0b002f;
        public static final int account_To_TextView=0x7f0b002e;
        public static final int account_balance=0x7f0b000a;
        public static final int account_delete=0x7f0b003f;
        public static final int account_edit=0x7f0b003e;
        public static final int account_name=0x7f0b0009;
        public static final int addAccountText=0x7f0b0007;
        public static final int addCategoryText=0x7f0b000f;
        public static final int addTransactionIcon=0x7f0b0006;
        public static final int addTransactionText=0x7f0b0035;
        public static final int add_transaction=0x7f0b0049;
        public static final int amount_EditText=0x7f0b0021;
        public static final int amount_TextView=0x7f0b0020;
        public static final int backup=0x7f0b0047;
        public static final int buttonDone=0x7f0b0016;
        public static final int categories=0x7f0b0045;
        public static final int category_Frame=0x7f0b0030;
        public static final int category_Spinner=0x7f0b0027;
        public static final int category_TextView=0x7f0b0026;
        public static final int category_name=0x7f0b0012;
        public static final int date_EditText=0x7f0b0024;
        public static final int date_TextView=0x7f0b0023;
        public static final int delete=0x7f0b0040;
        public static final int desposit_RadioButton=0x7f0b001e;
        public static final int edit=0x7f0b0041;
        public static final int editTextCategoryName=0x7f0b0018;
        public static final int footer=0x7f0b0005;
        public static final int funds=0x7f0b0004;
        public static final int fundsTextView=0x7f0b0032;
        public static final int help=0x7f0b0048;
        public static final int imageView1=0x7f0b0001;
        public static final int linearLayout1=0x7f0b0002;
        public static final int listView1=0x7f0b0034;
        public static final int listViewCategories=0x7f0b0010;
        public static final int new_account=0x7f0b0000;
        public static final int new_account_balance_edit_text=0x7f0b0014;
        public static final int new_account_done_button=0x7f0b0015;
        public static final int new_account_name_edit_text=0x7f0b0013;
        public static final int new_transaction=0x7f0b0043;
        public static final int new_transaction_activity_done_Button=0x7f0b0019;
        public static final int note_EditText=0x7f0b002a;
        public static final int note_TextView=0x7f0b0029;
        public static final int overview=0x7f0b0031;
        public static final int overviewRecentTransactionsHeader=0x7f0b0033;
        public static final int overviewTotalHeader=0x7f0b0037;
        public static final int pendingLabel=0x7f0b0003;
        public static final int preferences=0x7f0b0046;
        public static final int radioButtonExpense=0x7f0b000d;
        public static final int radioButtonIncome=0x7f0b000e;
        public static final int radioGroupExpenseOrIncome=0x7f0b000c;
        public static final int spinnerCategory=0x7f0b0011;
        public static final int tableRow1=0x7f0b001f;
        public static final int tableRow2=0x7f0b0022;
        public static final int tableRow3=0x7f0b0025;
        public static final int tableRow4=0x7f0b0028;
        public static final int textViewCategoryName=0x7f0b0017;
        public static final int transactionListView=0x7f0b0036;
        public static final int transaction_amount=0x7f0b003a;
        public static final int transaction_category=0x7f0b003b;
        public static final int transaction_date=0x7f0b003c;
        public static final int transaction_memo=0x7f0b003d;
        public static final int transaction_name=0x7f0b0039;
        public static final int transfer=0x7f0b0044;
        public static final int withdrawl_RadioButton=0x7f0b001d;
        public static final int Deposit_Or_Withdrawl=0x7f0b0017;
        public static final int Deposit_Or_Withdrawl_Or_Transfer=0x7f0b002d;
        public static final int Done=0x7f0b0040;
        public static final int Payee_editText=0x7f0b0016;
        public static final int Payee_textView=0x7f0b0015;
        public static final int TextView01=0x7f0b0027;
        public static final int accountBalance=0x7f0b0006;
        public static final int accountNameListView=0x7f0b0003;
        public static final int account_From_Spinner=0x7f0b0028;
        public static final int account_To_Spinner=0x7f0b002a;
        public static final int account_To_TextView=0x7f0b0029;
        public static final int account_balance=0x7f0b0005;
        public static final int account_delete=0x7f0b003d;
        public static final int account_edit=0x7f0b003c;
        public static final int account_name=0x7f0b0004;
        public static final int actionSpinner=0x7f0b0026;
        public static final int addAccountText=0x7f0b0002;
        public static final int addCategoryText=0x7f0b000a;
        public static final int addTransactionIcon=0x7f0b0001;
        public static final int addTransactionText=0x7f0b0033;
        public static final int add_transaction=0x7f0b0045;
        public static final int amount_EditText=0x7f0b001c;
        public static final int amount_TextView=0x7f0b001b;
        public static final int balance_textView=0x7f0b002e;
        public static final int buttonDone=0x7f0b0011;
        public static final int categories=0x7f0b0043;
        public static final int category_Frame=0x7f0b002b;
        public static final int category_Spinner=0x7f0b0022;
        public static final int category_TextView=0x7f0b0021;
        public static final int category_name=0x7f0b000d;
        public static final int date_EditText=0x7f0b001f;
        public static final int date_TextView=0x7f0b001e;
        public static final int delete=0x7f0b003e;
        public static final int desposit_RadioButton=0x7f0b0019;
        public static final int edit=0x7f0b003f;
        public static final int editTextCategoryName=0x7f0b0013;
        public static final int footer=0x7f0b0000;
        public static final int fundsTextView=0x7f0b002f;
        public static final int linearLayout1=0x7f0b0031;
        public static final int listView1=0x7f0b0030;
        public static final int listViewCategories=0x7f0b000b;
        public static final int new_account_balance_edit_text=0x7f0b000f;
        public static final int new_account_done_button=0x7f0b0010;
        public static final int new_account_name_edit_text=0x7f0b000e;
        public static final int new_transaction=0x7f0b0041;
        public static final int new_transaction_activity_done_Button=0x7f0b0014;
        public static final int note_EditText=0x7f0b0025;
        public static final int note_TextView=0x7f0b0024;
        public static final int overview=0x7f0b002c;
        public static final int overviewRecentTransactionsHeader=0x7f0b0036;
        public static final int overviewTotalHeader=0x7f0b0035;
        public static final int pendingLabel=0x7f0b0032;
        public static final int preferences=0x7f0b0044;
        public static final int radioButtonExpense=0x7f0b0008;
        public static final int radioButtonIncome=0x7f0b0009;
        public static final int radioGroupExpenseOrIncome=0x7f0b0007;
        public static final int spinnerCategory=0x7f0b000c;
        public static final int tableRow1=0x7f0b001a;
        public static final int tableRow2=0x7f0b001d;
        public static final int tableRow3=0x7f0b0020;
        public static final int tableRow4=0x7f0b0023;
        public static final int textViewCategoryName=0x7f0b0012;
        public static final int transactionListView=0x7f0b0034;
        public static final int transaction_amount=0x7f0b0038;
        public static final int transaction_category=0x7f0b0039;
        public static final int transaction_date=0x7f0b003a;
        public static final int transaction_memo=0x7f0b003b;
        public static final int transaction_name=0x7f0b0037;
        public static final int transfer=0x7f0b0042;
        public static final int withdrawl_RadioButton=0x7f0b0018;
    }
    public static final class layout {
        public static final int accounts_activity_layout=0x7f030000;
File
R.java
Developer's decision
Concatenation
Kind of conflict
Attribute