Commit c45321b1 authored by Bostjan Pintar's avatar Bostjan Pintar
Browse files

Merge update

parent 169e8ade

ttcn/AtsImsIot/AtsImsIot_TP_behavior_MX.ttcn

+0 −47
Original line number Diff line number Diff line 
<<<<<<< HEAD

=======

<<<<<<<< HEAD:ttcn/AtsImsIot/AtsImsIot_TP_behavior_MX.ttcn

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138

/**

 *  @author     STF 574

 *  @version    $Id$
@@ -274,10 +270,6 @@ module AtsImsIot_TP_behavior_MX { 
                p_monitorCompRef.done;

            }

        } // End of function f_mtc_check_TP_MX_ECSCF_ECO_100Trying_01

<<<<<<< HEAD

 

=======

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138

        

    } // End of group ims100Trying
@@ -828,7 +820,6 @@ module AtsImsIot_TP_behavior_MX { 


    } // End of group ims3xxAny



<<<<<<< HEAD

    group imsINFO{  

		

		/**
@@ -985,41 +976,3 @@ module AtsImsIot_TP_behavior_MX { 




} // End of module AtsImsIot_TP_behavior_MX
 
=======

} // End of module AtsImsIot_TP_behavior_MX

========

// /**

//  *  @author     TTF T010

//  *  @version    $Id$

//  *  @desc       This module provides the TP behaviour functions at Mw interface at P-CSCF/E-CSCF

//  */



// module AtsImsIot_TP_behavior_MW_EC { // TODO: To be removed



//     // LibIms

//     import from LibIms_Templates all;

//     import from LibIms_UpperTester all;

//     // LibIot

//     import from LibIot_TypesAndValues all;

//     import from LibIot_Functions all;

//     import from LibIot_TestInterface all;

//     import from LibIot_PIXITS all;

//     // LibSip

//     import from LibSip_SIPTypesAndValues all;

//     import from LibSip_Templates all;

//     import from LibSip_Common all;

//     import from LibSip_SDPTypes all;

//     // LibMsrp

//     import from LibMsrp_TypesAndValues all;

//     import from LibMsrp_Functions all;

//     import from LibMsrp_Templates all;

//     // AtsImsIot

//     import from AtsImsIot_TestSystem all;

//     import from AtsImsIot_Templates_MW all;

//     import from AtsImsIot_Templates all;

//     import from AtsImsIot_TypesAndValues all;

//     import from AtsImsIot_Functions all;



// } // End of module AtsImsIot_TP_behavior_MW_EC

>>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138:ttcn/AtsImsIot/AtsImsIot_TP_behavior_MW_EC.ttcn

>>>>>>> 0593f0d89e43a3f1703bce34b66025c749549138