Projects >> SWADroid >>f9d91caadd0703cf139bdc6a11e8a5c905107dca

Chunk
Conflicting content 
    }
    public static final class id {
        public static final int actionBarLayout=0x7f090000;
<<<<<<< HEAD
        public static final int clean_database_menu=0x7f090040;
        public static final int contentWebView=0x7f090025;
        public static final int courseNameText=0x7f090023;
        public static final int decrement=0x7f090021;
        public static final int eventContent=0x7f09001a;
        public static final int eventDate=0x7f090016;
        public static final int eventLocation=0x7f09001c;
        public static final int eventMetaData=0x7f090014;
        public static final int eventSender=0x7f090018;
        public static final int eventSummary=0x7f09001d;
        public static final int eventText=0x7f09001e;
        public static final int eventTime=0x7f090017;
        public static final int eventType=0x7f09001b;
        public static final int increment=0x7f09001f;
        public static final int listIcon=0x7f090009;
        public static final int listItems=0x7f09000b;
        public static final int listText=0x7f09000a;
        public static final int messageReplyButton=0x7f090019;
        public static final int message_body_text=0x7f09000e;
        public static final int message_button_accept=0x7f09000f;
        public static final int message_button_cancel=0x7f090010;
        public static final int message_receivers_text=0x7f09000c;
        public static final int message_subject_text=0x7f09000d;
        public static final int moduleIcon=0x7f090001;
        public static final int moduleName=0x7f090002;
        public static final int notice_body_text=0x7f090011;
        public static final int notice_button_accept=0x7f090012;
        public static final int notice_button_cancel=0x7f090013;
        public static final int notificationIcon=0x7f090015;
        public static final int preferences_menu=0x7f090041;
        public static final int rate_menu=0x7f09003f;
        public static final int refresh=0x7f090008;
        public static final int senderNameText=0x7f090022;
        public static final int share_menu=0x7f09003e;
        public static final int summaryText=0x7f090024;
        public static final int testAnswerTypesAcceptButton=0x7f090028;
        public static final int testAnswerTypesList=0x7f090027;
        public static final int testAnswerTypesText=0x7f090026;
        public static final int testEvaluateButton=0x7f090006;
        public static final int testMakeAnswer=0x7f09002c;
        public static final int testMakeBottomBar=0x7f090031;
        public static final int testMakeCorrectAnswer=0x7f09002f;
        public static final int testMakeCorrectAnswerImage=0x7f09002d;
        public static final int testMakeEditText=0x7f09002e;
        public static final int testMakeList=0x7f090030;
        public static final int testMakeNextButton=0x7f090034;
        public static final int testMakePrevButton=0x7f090032;
        public static final int testMakeQuestionScore=0x7f09002a;
        public static final int testMakeStem=0x7f090029;
        public static final int testMakeText=0x7f09002b;
        public static final int testNumQuestionsAcceptButton=0x7f09003a;
        public static final int testNumQuestionsNumberPicker=0x7f090037;
        public static final int testNumQuestionsText=0x7f090039;
        public static final int testResultsButton=0x7f090038;
        public static final int testResultsScore=0x7f090036;
        public static final int testResultsText=0x7f090035;
        public static final int testShowResultsButton=0x7f090004;
        public static final int testTagsAcceptButton=0x7f09003d;
        public static final int testTagsList=0x7f09003c;
        public static final int testTagsText=0x7f09003b;
        public static final int test_questions_bar=0x7f090033;
        public static final int timepicker_input=0x7f090020;
=======
        public static final int clean_database_menu=0x7f09003f;
        public static final int contentWebView=0x7f090024;
        public static final int courseNameText=0x7f090022;
        public static final int decrement=0x7f090020;
        public static final int eventContent=0x7f090018;
        public static final int eventDate=0x7f090014;
        public static final int eventLocation=0x7f09001a;
        public static final int eventMetaData=0x7f090012;
        public static final int eventMsg=0x7f09001d;
        public static final int eventSender=0x7f090016;
        public static final int eventSummary=0x7f09001b;
        public static final int eventText=0x7f09001c;
        public static final int eventTime=0x7f090015;
        public static final int eventType=0x7f090019;
        public static final int increment=0x7f09001e;
        public static final int listIcon=0x7f09000a;
        public static final int listItems=0x7f09000c;
        public static final int listText=0x7f09000b;
        public static final int messageReplyButton=0x7f090017;
        public static final int message_body_text=0x7f09000f;
        public static final int message_button_accept=0x7f090010;
        public static final int message_button_cancel=0x7f090011;
        public static final int message_receivers_text=0x7f09000d;
        public static final int message_subject_text=0x7f09000e;
        public static final int moduleIcon=0x7f090001;
        public static final int moduleName=0x7f090002;
        public static final int notificationIcon=0x7f090013;
        public static final int preferences_menu=0x7f090040;
        public static final int progress_refresh=0x7f090009;
        public static final int rate_menu=0x7f09003e;
        public static final int refresh=0x7f090008;
        public static final int senderNameText=0x7f090021;
        public static final int share_menu=0x7f09003d;
        public static final int summaryText=0x7f090023;
        public static final int testAnswerTypesAcceptButton=0x7f090027;
        public static final int testAnswerTypesList=0x7f090026;
        public static final int testAnswerTypesText=0x7f090025;
        public static final int testEvaluateButton=0x7f090006;
        public static final int testMakeAnswer=0x7f09002b;
        public static final int testMakeBottomBar=0x7f090030;
        public static final int testMakeCorrectAnswer=0x7f09002e;
        public static final int testMakeCorrectAnswerImage=0x7f09002c;
        public static final int testMakeEditText=0x7f09002d;
        public static final int testMakeList=0x7f09002f;
        public static final int testMakeNextButton=0x7f090033;
        public static final int testMakePrevButton=0x7f090031;
        public static final int testMakeQuestionScore=0x7f090029;
        public static final int testMakeStem=0x7f090028;
        public static final int testMakeText=0x7f09002a;
        public static final int testNumQuestionsAcceptButton=0x7f090039;
        public static final int testNumQuestionsNumberPicker=0x7f090036;
        public static final int testNumQuestionsText=0x7f090038;
        public static final int testResultsButton=0x7f090037;
        public static final int testResultsScore=0x7f090035;
        public static final int testResultsText=0x7f090034;
        public static final int testShowResultsButton=0x7f090004;
        public static final int testTagsAcceptButton=0x7f09003c;
        public static final int testTagsList=0x7f09003b;
        public static final int testTagsText=0x7f09003a;
        public static final int test_questions_bar=0x7f090032;
        public static final int timepicker_input=0x7f09001f;
>>>>>>> f5551d1243542568d683b4ffe1a9bd3d827640f0
        public static final int title_sep_1=0x7f090007;
        public static final int title_sep_2=0x7f090005;
        public static final int title_sep_3=0x7f090003;
Solution content 
    }
    public static final class id {
        public static final int actionBarLayout=0x7f090000;
        public static final int clean_database_menu=0x7f090042;
        public static final int contentWebView=0x7f090027;
        public static final int courseNameText=0x7f090025;
        public static final int decrement=0x7f090023;
        public static final int eventContent=0x7f09001b;
        public static final int eventDate=0x7f090017;
        public static final int eventLocation=0x7f09001d;
        public static final int eventMetaData=0x7f090015;
        public static final int eventMsg=0x7f090020;
        public static final int eventSender=0x7f090019;
        public static final int eventSummary=0x7f09001e;
        public static final int eventText=0x7f09001f;
        public static final int eventTime=0x7f090018;
        public static final int eventType=0x7f09001c;
        public static final int increment=0x7f090021;
        public static final int listIcon=0x7f09000a;
        public static final int listItems=0x7f09000c;
        public static final int listText=0x7f09000b;
        public static final int messageReplyButton=0x7f09001a;
        public static final int message_body_text=0x7f09000f;
        public static final int message_button_accept=0x7f090010;
        public static final int message_button_cancel=0x7f090011;
        public static final int message_receivers_text=0x7f09000d;
        public static final int message_subject_text=0x7f09000e;
        public static final int moduleIcon=0x7f090001;
        public static final int moduleName=0x7f090002;
        public static final int notice_body_text=0x7f090012;
        public static final int notice_button_accept=0x7f090013;
        public static final int notice_button_cancel=0x7f090014;
        public static final int notificationIcon=0x7f090016;
        public static final int preferences_menu=0x7f090043;
        public static final int progress_refresh=0x7f090009;
        public static final int rate_menu=0x7f090041;
        public static final int refresh=0x7f090008;
        public static final int senderNameText=0x7f090024;
        public static final int share_menu=0x7f090040;
        public static final int summaryText=0x7f090026;
        public static final int testAnswerTypesAcceptButton=0x7f09002a;
        public static final int testAnswerTypesList=0x7f090029;
        public static final int testAnswerTypesText=0x7f090028;
        public static final int testEvaluateButton=0x7f090006;
        public static final int testMakeAnswer=0x7f09002e;
        public static final int testMakeBottomBar=0x7f090033;
        public static final int testMakeCorrectAnswer=0x7f090031;
        public static final int testMakeCorrectAnswerImage=0x7f09002f;
        public static final int testMakeEditText=0x7f090030;
        public static final int testMakeList=0x7f090032;
        public static final int testMakeNextButton=0x7f090036;
        public static final int testMakePrevButton=0x7f090034;
        public static final int testMakeQuestionScore=0x7f09002c;
        public static final int testMakeStem=0x7f09002b;
        public static final int testMakeText=0x7f09002d;
        public static final int testNumQuestionsAcceptButton=0x7f09003c;
        public static final int testNumQuestionsNumberPicker=0x7f090039;
        public static final int testNumQuestionsText=0x7f09003b;
        public static final int testResultsButton=0x7f09003a;
        public static final int testResultsScore=0x7f090038;
        public static final int testResultsText=0x7f090037;
        public static final int testShowResultsButton=0x7f090004;
        public static final int testTagsAcceptButton=0x7f09003f;
        public static final int testTagsList=0x7f09003e;
        public static final int testTagsText=0x7f09003d;
        public static final int test_questions_bar=0x7f090035;
        public static final int timepicker_input=0x7f090022;
        public static final int title_sep_1=0x7f090007;
        public static final int title_sep_2=0x7f090005;
        public static final int title_sep_3=0x7f090003;
File
R.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
        public static final int googlePlusURL=0x7f07006e;
        public static final int initialDialogTitle=0x7f070057;
        public static final int loginModuleLabel=0x7f070001;
<<<<<<< HEAD
        public static final int loginProgressDescription=0x7f07001e;
        public static final int loginProgressTitle=0x7f07001d;
        public static final int loginSuccessfulMsg=0x7f07002c;
        public static final int loginTitle_menu=0x7f07001c;
        public static final int mailingListTitle=0x7f070075;
        public static final int mailingListURL=0x7f07006f;
        public static final int marketTitle=0x7f070077;
        public static final int marketURL=0x7f07006a;
        public static final int marketWebURL=0x7f07006b;
        public static final int marksFile=0x7f07002e;
        public static final int message=0x7f070030;
        public static final int messageSendErrorMsg=0x7f07005f;
        public static final int messageSendedMsg=0x7f07005e;
        public static final int message_body_title=0x7f070062;
        public static final int message_receivers_title=0x7f070060;
        public static final int message_subject_title=0x7f070061;
        public static final int messages=0x7f070033;
=======
        public static final int loginProgressDescription=0x7f07001d;
        public static final int loginProgressTitle=0x7f07001c;
        public static final int loginSuccessfulMsg=0x7f07002b;
        public static final int loginTitle_menu=0x7f07001b;
        public static final int mailingListTitle=0x7f070070;
        public static final int mailingListURL=0x7f07006a;
        public static final int marketTitle=0x7f070072;
        public static final int marketURL=0x7f070065;
        public static final int marketWebURL=0x7f070066;
        public static final int marksFile=0x7f07002d;
        public static final int marksMsg=0x7f070076;
        public static final int message=0x7f07002f;
        public static final int messageSendErrorMsg=0x7f07005e;
        public static final int messageSendedMsg=0x7f07005d;
        public static final int message_body_title=0x7f070061;
        public static final int message_receivers_title=0x7f07005f;
        public static final int message_subject_title=0x7f070060;
        public static final int messages=0x7f070032;
>>>>>>> f5551d1243542568d683b4ffe1a9bd3d827640f0
        public static final int messagesModuleLabel=0x7f070005;
        public static final int noContentMsg=0x7f07003b;
        public static final int noCourseSelectedMsg=0x7f070044;
Solution content 
        public static final int googlePlusURL=0x7f07006e;
        public static final int initialDialogTitle=0x7f070057;
        public static final int loginModuleLabel=0x7f070001;
        public static final int loginProgressDescription=0x7f07001e;
        public static final int loginProgressTitle=0x7f07001d;
        public static final int loginSuccessfulMsg=0x7f07002c;
        public static final int loginTitle_menu=0x7f07001c;
        public static final int mailingListTitle=0x7f070075;
        public static final int mailingListURL=0x7f07006f;
        public static final int marketTitle=0x7f070077;
        public static final int marketURL=0x7f07006a;
        public static final int marketWebURL=0x7f07006b;
        public static final int marksFile=0x7f07002e;
        public static final int marksMsg=0x7f07007b;
        public static final int message=0x7f070030;
        public static final int messageSendErrorMsg=0x7f07005f;
        public static final int messageSendedMsg=0x7f07005e;
        public static final int message_body_title=0x7f070062;
        public static final int message_receivers_title=0x7f070060;
        public static final int message_subject_title=0x7f070061;
        public static final int messages=0x7f070033;
        public static final int messagesModuleLabel=0x7f070005;
        public static final int noContentMsg=0x7f07003b;
        public static final int noCourseSelectedMsg=0x7f070044;
File
R.java
Developer's decision
Manual
Kind of conflict
Attribute