Commit c66ee9ec authored by Yann Garcia's avatar Yann Garcia
Browse files

Resolve merge conflict in ItsSecurity_TestCases

parent a5579b4e

ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc

+0 −3
Changes for ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ int uppertester_ivim_codec::encode (const Record_Type& msg, OCTETSTRING& data) 
    if (r.connectedIviStructures().is_present()) { // C

      flags |= 0x10;

    }

    if (r.optional__().is_present()) { // O

      flags |= 0x08;

    }

    encoding_buffer.put_c(flags);

    loggers::get_instance().log_to_hexa("uppertester_ivim_codec::encode: flags=", encoding_buffer);

    // Continue with encoding

ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn

+0 −1
Changes for ttcn/AtsSecurity/ItsSecurity_TestCases.ttcn: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ module ItsSecurity_TestCases { 
    import from ItsSecurity_TestSystem all;

    import from ItsSecurity_Functions all;

    import from ItsSecurity_Templates all;

    import from ItsSecurity_Pics all;

    

    /**

     * @desc Sending behaviour test cases