Commit 12113d77 authored by berge's avatar berge
Browse files

Fixed minor merging issues

parent 913db53d

ttcn/DENM/LibItsDenm_Templates.ttcn

+0 −10
Original line number Diff line number Diff line
@@ -418,16 +418,6 @@ module LibItsDenm_Templates { 
            transmissionInterval := p_transmissionInterval,

            stationType := p_stationType

        }

        template (value) ManagementContainer m_denmMgmtConTermination (

        	template (value) ActionID p_actionID,

            template (value) StationType p_stationType := f_getTsStationId(),

            template (value) ValidityDuration p_validityDuration := c_defaultValidity,

            template (value) TimestampIts p_detectionTime := f_getCurrentTime(),

            template (value) TimestampIts p_referenceTime := f_getCurrentTime(),

            template (value) Termination p_termination

        ) modifies m_denmMgmtCon := {

			termination	:= p_termination

        }

        

        /**

         * @desc    Send template for Management Container

ttcn/GeoNetworking/LibItsGeoNetworking_Functions.ttcn

+2 −2
Original line number Diff line number Diff line
@@ -744,7 +744,7 @@ module LibItsGeoNetworking_Functions { 
            f_acTriggerEvent(m_stopBeaconing);

            if (PICS_GN_SECURITY == true) {

            	deactivate(vc_neighbourDefault);

            

            }

        } // end f_stopBeingNeighbour

        

        /**