Commit c2c5dd4b authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Taking out merge conflict cruft

parent 935a6ab3

102232-1/LI-PS-PDU.asn

+0 −4
Original line number Diff line number Diff line
@@ -697,11 +697,7 @@ WlanLocationAttributes ::= SEQUENCE 


CPEProvidedLocation ::= SEQUENCE

{

<<<<<<< HEAD

    wGS84CoordinateDecimal        [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,

=======

    wGS84CoordinateDecimal        [1] TS103280.WGS84CoordinateDecimal OPTIONAL,

>>>>>>> 70149cc568d8dd2ea282faeaad95a2876cac3f77

    ...

}